diff --git a/hook.php b/hook.php
index d51d0c35..68167f18 100644
--- a/hook.php
+++ b/hook.php
@@ -42,7 +42,7 @@ function plugin_ocsinventoryng_install() {
&& !$DB->tableExists("ocs_glpi_ocsservers")) {
$install = true;
- $DB->runFile(GLPI_ROOT . "/plugins/ocsinventoryng/install/mysql/1.5.0-empty.sql");
+ $DB->runFile(GLPI_ROOT . "/plugins/ocsinventoryng/install/mysql/1.5.2-empty.sql");
$migration->createRule(['sub_type' => 'RuleImportComputer',
'entities_id' => 0,
@@ -1250,6 +1250,15 @@ function plugin_ocsinventoryng_install() {
/******************* Migration 1.5.1 *******************/
+ /******************* Migration 1.5.2 *******************/
+
+ if (!$DB->fieldExists('glpi_plugin_ocsinventoryng_ocsservers', 'history_os')) {
+ $query = "ALTER TABLE `glpi_plugin_ocsinventoryng_ocsservers`
+ ADD `history_os` tinyint(1) NOT NULL DEFAULT '1';";
+ $DB->queryOrDie($query, "1.5.1 add history_os in glpi_plugin_ocsinventoryng_ocsservers");
+ }
+
+ /******************* Migration 1.5.2 *******************/
$cron = new CronTask();
if (!$cron->getFromDBbyName('PluginOcsinventoryngThread', 'CleanOldThreads')) {
@@ -1556,12 +1565,10 @@ function plugin_ocsinventoryng_MassiveActions($type) {
return [// Specific one
'PluginOcsinventoryngOcsProcess' . MassiveAction::CLASS_ACTION_SEPARATOR .
"plugin_ocsinventoryng_launch_ocsng_update"
- => __('Launch synchronization',
- 'ocsinventoryng'),
+ => _sx('button', 'Launch synchronization', 'ocsinventoryng'),
'PluginOcsinventoryngOcsProcess' . MassiveAction::CLASS_ACTION_SEPARATOR .
"plugin_ocsinventoryng_force_ocsng_update"
- => __('Force full import',
- 'ocsinventoryng'),
+ => _sx('button', 'Force full import', 'ocsinventoryng'),
'PluginOcsinventoryngOcsProcess' . MassiveAction::CLASS_ACTION_SEPARATOR .
"plugin_ocsinventoryng_lock_ocsng_field" => __('Lock fields',
'ocsinventoryng'),
diff --git a/inc/antivirus.class.php b/inc/antivirus.class.php
index 74bc4e3c..4f6ee692 100644
--- a/inc/antivirus.class.php
+++ b/inc/antivirus.class.php
@@ -54,8 +54,17 @@ class PluginOcsinventoryngAntivirus extends CommonDBChild {
*/
static function updateAntivirus($computers_id, $ocsComputer, $cfg_ocs, $force) {
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
+
if ($force) {
- self::resetAntivirus($computers_id, $cfg_ocs['history_plugins']);
+ self::resetAntivirus($computers_id, $uninstall_history);
}
$av = new ComputerAntivirus();
//update data
@@ -74,7 +83,7 @@ static function updateAntivirus($computers_id, $ocsComputer, $cfg_ocs, $force) {
$input["is_active"] = $antivirus["ENABLED"];
$input["is_uptodate"] = $antivirus["UPTODATE"];
$input["is_dynamic"] = 1;
- $av->add($input, ['disable_unicity_check' => true], $cfg_ocs['history_plugins']);
+ $av->add($input, ['disable_unicity_check' => true], $install_history);
}
}
}
@@ -83,14 +92,14 @@ static function updateAntivirus($computers_id, $ocsComputer, $cfg_ocs, $force) {
* Delete old antivirus entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetAntivirus($glpi_computers_id, $history_plugins) {
+ static function resetAntivirus($glpi_computers_id, $uninstall_history) {
$av = new ComputerAntivirus();
$av->deleteByCriteria(['computers_id' => $glpi_computers_id,
- 'is_dynamic' => 1], 1, $history_plugins);
+ 'is_dynamic' => 1], 1, $uninstall_history);
}
}
diff --git a/inc/bios.class.php b/inc/bios.class.php
index 528b6649..4d622cb2 100644
--- a/inc/bios.class.php
+++ b/inc/bios.class.php
@@ -96,9 +96,15 @@ static function updateComputerBios($params = []) {
if (isset($params["BIOS"])) {
$bios = $params['BIOS'];
+ $cfg_ocs = $params['cfg_ocs'];
$ocs_db_utf8 = $params['cfg_ocs']['ocs_db_utf8'];
$force = $params["force"];
+ $update_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && $cfg_ocs['history_bios'] == 1) {
+ $update_history = 1;
+ }
+
if ($params['cfg_ocs']["import_general_serial"]
&& $params['cfg_ocs']["import_general_serial"] > 0
&& intval($params['cfg_ocs']["import_device_bios"]) > 0
@@ -142,7 +148,7 @@ static function updateComputerBios($params = []) {
$compupdate["id"] = $params['computers_id'];
$compupdate["entities_id"] = $params['entities_id'];
$comp = new Computer();
- $comp->update($compupdate, $params['cfg_ocs']['history_bios']);
+ $comp->update($compupdate, $update_history);
}
}
}
diff --git a/inc/device.class.php b/inc/device.class.php
index 10ebf7ca..b220555d 100644
--- a/inc/device.class.php
+++ b/inc/device.class.php
@@ -54,17 +54,25 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
$computers_id = $params['computers_id'];
$entities_id = $params['entities_id'];
+ $cfg_ocs = $params['cfg_ocs'];
+ $ocs_db_utf8 = $params['cfg_ocs']['ocs_db_utf8'];
+ $force = $params['force'];
- $history_devices = $params['cfg_ocs']['history_devices'];
- $ocs_db_utf8 = $params['cfg_ocs']['ocs_db_utf8'];
- $force = $params['force'];
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_devices'] == 1 || $cfg_ocs['history_devices'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_devices'] == 1 || $cfg_ocs['history_devices'] == 2)) {
+ $install_history = 1;
+ }
switch ($devicetype) {
case "Item_DeviceFirmware":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -96,13 +104,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicefirmwares_id' => $bios_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicefirmwares_id' => $bios_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
@@ -112,7 +120,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
//MEMORIES
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -157,14 +165,14 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'entities_id' => $entities_id,
'devicememories_id' => $ram_id,
'size' => $line2["CAPACITY"],
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicememories_id' => $ram_id,
'size' => $line2["CAPACITY"],
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -174,7 +182,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceHardDrive":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -211,7 +219,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'deviceharddrives_id' => $dd_id,
'serial' => $line2["SERIALNUMBER"],
'capacity' => $line2["DISKSIZE"],
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
@@ -219,7 +227,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'serial' => $line2["SERIALNUMBER"],
'capacity' => $line2["DISKSIZE"],
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -229,7 +237,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceDrive":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -260,13 +268,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicedrives_id' => $stor_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicedrives_id' => $stor_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -278,7 +286,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
if (isset($ocsComputer['MODEMS'])) {
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -303,13 +311,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicepcis_id' => $mdm_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicepcis_id' => $mdm_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -318,7 +326,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
if (isset($ocsComputer['PORTS'])) {
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
foreach ($ocsComputer['PORTS'] as $line2) {
@@ -350,13 +358,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicepcis_id' => $port_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicepcis_id' => $port_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -366,7 +374,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
if (isset($ocsComputer['SLOTS'])) {
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -395,13 +403,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicepcis_id' => $pci_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicepcis_id' => $pci_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -411,7 +419,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceProcessor":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -444,14 +452,14 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'entities_id' => $entities_id,
'deviceprocessors_id' => $proc_id,
'frequency' => $line2["SPEED"],
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'deviceprocessors_id' => $proc_id,
'is_dynamic' => 1,
'frequency' => $line2["SPEED"],
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -460,7 +468,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceNetworkCard":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
//Carte reseau
PluginOcsinventoryngNetworkPort::importNetwork($params['cfg_ocs'], $ocsComputer,
@@ -470,7 +478,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceGraphicCard":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -498,14 +506,14 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'entities_id' => $entities_id,
'devicegraphiccards_id' => $video_id,
'memory' => $line2["MEMORY"],
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicegraphiccards_id' => $video_id,
'is_dynamic' => 1,
'memory' => $line2["MEMORY"],
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -515,7 +523,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceSoundCard":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -544,13 +552,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicesoundcards_id' => $snd_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicesoundcards_id' => $snd_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
}
@@ -559,7 +567,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceMotherboard":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
$CompDevice = new $devicetype();
@@ -585,14 +593,14 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'entities_id' => $entities_id,
'devicemotherboards_id' => $devicemotherboards_id,
'serial' => $serial,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicemotherboards_id' => $devicemotherboards_id,
'is_dynamic' => 1,
'serial' => $serial,
- 'entities_id' => $entities_id], [], $history_devices);
+ 'entities_id' => $entities_id], [], $install_history);
}
}
@@ -600,7 +608,7 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
case "Item_DeviceControl":
if ($force) {
- self::resetDevices($computers_id, $devicetype, $history_devices);
+ self::resetDevices($computers_id, $devicetype, $uninstall_history);
}
//controllers
$CompDevice = new $devicetype();
@@ -634,13 +642,13 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicecontrols_id' => $ctrl_id,
- 'is_dynamic' => 1], $history_devices);
+ 'is_dynamic' => 1], $install_history);
} else {
$CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicecontrols_id' => $ctrl_id,
- 'is_dynamic' => 1], [], $history_devices);
+ 'is_dynamic' => 1], [], $install_history);
}
}
@@ -657,16 +665,16 @@ static function updateDevices($devicetype, $ocsComputer, $params) {
* @param $glpi_computers_id integer : glpi computer id.
* @param $itemtype integer : device type identifier.
*
- * @param $history_devices
+ * @param $history
*
* @return void .
*/
- static function resetDevices($glpi_computers_id, $itemtype, $history_devices) {
+ static function resetDevices($glpi_computers_id, $itemtype, $history) {
$item = new $itemtype();
$item->deleteByCriteria(['items_id' => $glpi_computers_id,
'itemtype' => 'Computer',
- 'is_dynamic' => 1], 1, $history_devices);
+ 'is_dynamic' => 1], 1, $history);
}
}
diff --git a/inc/disk.class.php b/inc/disk.class.php
index ab849c5e..891a7104 100644
--- a/inc/disk.class.php
+++ b/inc/disk.class.php
@@ -58,11 +58,20 @@ class PluginOcsinventoryngDisk extends CommonDBChild {
* @throws \GlpitestSQLError
* @internal param int $ocsid : ocs computer id (ID).
*/
- static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $history_drives, $force) {
+ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs, $force) {
global $DB;
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_drives'] == 1 || $cfg_ocs['history_drives'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_drives'] == 1 || $cfg_ocs['history_drives'] == 2)) {
+ $install_history = 1;
+ }
+
if ($force) {
- self::resetDisks($computers_id, $history_drives);
+ self::resetDisks($computers_id, $uninstall_history);
}
$already_processed = [];
@@ -138,7 +147,7 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $history
if (!$id) {
$d->reset();
$disk['is_dynamic'] = 1;
- $id_disk = $d->add($disk, [], $history_drives);
+ $id_disk = $d->add($disk, [], $install_history);
$already_processed[] = $id_disk;
} else {
// Only update if needed
@@ -154,7 +163,7 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $history
$toupdate['totalsize'] = $disk['totalsize'];
$toupdate['freesize'] = $disk['freesize'];
$toupdate['filesystems_id'] = $disk['filesystems_id'];
- $d->update($toupdate, $history_drives);
+ $d->update($toupdate, $install_history);
}
$already_processed[] = $id;
}
@@ -178,9 +187,9 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $history
//Delete all connexions
$d->delete(['id' => $data['id'],
'_ocsservers_id' => $ocsservers_id,
- '_no_history' => !$history_drives],
+ '_no_history' => !$uninstall_history],
true,
- $history_drives);
+ $uninstall_history);
}
}
@@ -189,15 +198,15 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $history
*
* @param $glpi_computers_id integer : glpi computer id.
*
- * @param $history_drives
+ * @param $uninstall_history
* @return void .
*/
- static function resetDisks($glpi_computers_id, $history_drives) {
+ static function resetDisks($glpi_computers_id, $uninstall_history) {
$dd = new Item_Disk();
$dd->deleteByCriteria(['items_id' => $glpi_computers_id,
'itemtype' => 'Computer',
- 'is_dynamic' => 1], 1, $history_drives);
+ 'is_dynamic' => 1], 1, $uninstall_history);
}
}
diff --git a/inc/hardware.class.php b/inc/hardware.class.php
index 833cf8d4..88fc2da2 100644
--- a/inc/hardware.class.php
+++ b/inc/hardware.class.php
@@ -180,6 +180,12 @@ static function updateComputerHardware($options = []) {
$is_utf8 = $options['cfg_ocs']["ocs_db_utf8"];
$force = $options["force"];
+ $cfg_ocs = $options['cfg_ocs'];
+
+ $update_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && $cfg_ocs['history_hardware'] == 1) {
+ $update_history = 1;
+ }
if (isset($options['HARDWARE'])) {
$hardware = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($options['HARDWARE']));
@@ -236,8 +242,9 @@ static function updateComputerHardware($options = []) {
$updates["id"] = $options['computers_id'];
$updates["entities_id"] = $options['entities_id'];
$updates["_nolock"] = true;
+ $updates["_no_history"] = !$update_history;
$comp = new Computer();
- $comp->update($updates, $options['dohistory']);
+ $comp->update($updates, $update_history);
}
}
}
@@ -249,12 +256,17 @@ static function updateComputerHardware($options = []) {
* @param $line_links
* @param $data
* @param $history_hardware
+ *
* @return void
* @internal param $line_links
* @internal param $data
*/
- static function updateComputerFields($line_links, $data, $history_hardware) {
+ static function updateComputerFields($line_links, $data, $cfg_ocs) {
+ $update_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && $cfg_ocs['history_hardware'] == 1) {
+ $update_history = 1;
+ }
//If there's a location to update
if (isset($data['locations_id'])) {
$computer = new Computer();
@@ -280,7 +292,8 @@ static function updateComputerFields($line_links, $data, $history_hardware) {
$tmp['locations_id'] = $data['locations_id'];
$tmp["_nolock"] = true;
$tmp['id'] = $line_links['computers_id'];
- $computer->update($tmp, $history_hardware);
+ $tmp["_no_history"] = !$update_history;
+ $computer->update($tmp, $update_history);
}
}
}
@@ -308,10 +321,11 @@ static function updateComputerFields($line_links, $data, $history_hardware) {
}
}
if ($ko == 0) {
- $tmp['groups_id'] = $data['groups_id'];
- $tmp["_nolock"] = true;
- $tmp['id'] = $line_links['computers_id'];
- $computer->update($tmp, $history_hardware);
+ $tmp['groups_id'] = $data['groups_id'];
+ $tmp["_nolock"] = true;
+ $tmp['id'] = $line_links['computers_id'];
+ $tmp["_no_history"] = !$update_history;
+ $computer->update($tmp, $update_history);
}
}
}
diff --git a/inc/monitor.class.php b/inc/monitor.class.php
index 8c4a337f..ecfef92e 100644
--- a/inc/monitor.class.php
+++ b/inc/monitor.class.php
@@ -64,8 +64,17 @@ static function importMonitor($monitor_params) {
$entity = $monitor_params["entities_id"];
$force = $monitor_params["force"];
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_monitor'] == 1 || $cfg_ocs['history_monitor'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_monitor'] == 1 || $cfg_ocs['history_monitor'] == 2)) {
+ $install_history = 1;
+ }
+
if ($force && $cfg_ocs["import_monitor"] == 1) { // Only reset monitor as global in unit management
- self::resetMonitors($computers_id, $cfg_ocs['history_monitor']); // try to link monitor with existing
+ self::resetMonitors($computers_id, $uninstall_history); // try to link monitor with existing
}
$already_processed = [];
@@ -159,7 +168,7 @@ static function importMonitor($monitor_params) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_monitor = $m->add($input, [], $cfg_ocs['history_monitor']);
+ $id_monitor = $m->add($input, [], $install_history);
}
} else if ($cfg_ocs["import_monitor"] >= 2) {
//Config says : manage monitors as single units
@@ -213,7 +222,7 @@ static function importMonitor($monitor_params) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_monitor = $m->add($input, [], $cfg_ocs['history_monitor']);
+ $id_monitor = $m->add($input, [], $install_history);
}
} // ($cfg_ocs["import_monitor"] >= 2)
@@ -223,7 +232,7 @@ static function importMonitor($monitor_params) {
'itemtype' => 'Monitor',
'items_id' => $id_monitor,
'is_dynamic' => 1,
- 'is_deleted' => 0], [], $cfg_ocs['history_monitor']);
+ 'is_deleted' => 0], [], $install_history);
$already_processed[] = $id_monitor;
//Update column "is_deleted" set value to 0 and set status to default
@@ -248,7 +257,7 @@ static function importMonitor($monitor_params) {
$input["id"] = $id_monitor;
if (count($input)) {
$input['entities_id'] = $entity;
- $m->update($input, $cfg_ocs['history_monitor']);
+ $m->update($input, $install_history);
}
}
}
@@ -306,11 +315,11 @@ static function importMonitor($monitor_params) {
*
* @param $glpi_computers_id integer : glpi computer id.
*
- * @param $history_monitor
+ * @param $uninstall_history
* @return void .
* @throws \GlpitestSQLError
*/
- static function resetMonitors($glpi_computers_id, $history_monitor) {
+ static function resetMonitors($glpi_computers_id, $uninstall_history) {
global $DB;
$query = "SELECT *
@@ -326,7 +335,7 @@ static function resetMonitors($glpi_computers_id, $history_monitor) {
while ($data = $DB->fetch_assoc($result)) {
- $conn->delete(['id' => $data['id'], '_no_history' => !$history_monitor], true, $history_monitor);
+ $conn->delete(['id' => $data['id'], '_no_history' => !$uninstall_history], true, $uninstall_history);
$query2 = "SELECT COUNT(*)
FROM `glpi_computers_items`
@@ -335,7 +344,7 @@ static function resetMonitors($glpi_computers_id, $history_monitor) {
$result2 = $DB->query($query2);
if ($DB->result($result2, 0, 0) == 1) {
- $mon->delete(['id' => $data['items_id'], '_no_history' => !$history_monitor], true, $history_monitor);
+ $mon->delete(['id' => $data['items_id'], '_no_history' => !$uninstall_history], true, $uninstall_history);
}
}
}
diff --git a/inc/networkport.class.php b/inc/networkport.class.php
index c20afc1f..78aa6627 100644
--- a/inc/networkport.class.php
+++ b/inc/networkport.class.php
@@ -67,12 +67,21 @@ static function getTypeName($nb = 0) {
* @return int
*/
static private function updateNetworkPort($mac, $name, $computers_id, $instantiation_type,
- $inst_input, $ips, $check_name, $dohistory,
+ $inst_input, $ips, $check_name, $cfg_ocs,
$already_known_ports, $mask, $gateway, $subnet, $entities_id) {
global $DB;
$network_port = new NetworkPort();
+ $install_network_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_network'] == 1 || $cfg_ocs['history_network'] == 2)) {
+ $install_network_history = 1;
+ }
+ $uninstall_network_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_network'] == 1 || $cfg_ocs['history_network'] == 3)) {
+ $uninstall_network_history = 1;
+ }
+
// Then, find or create the base NetworkPort
$query = "SELECT `id`, `is_dynamic`
FROM `glpi_networkports`
@@ -98,19 +107,19 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
'mac' => $mac,
'items_id' => $computers_id,
'itemtype' => 'Computer',
- '_no_history' => !$dohistory,
+ '_no_history' => !$install_network_history,
'instantiation_type' => $instantiation_type,
'_create_children' => 1,
'is_dynamic' => 1,
'is_deleted' => 0];
- $networkports_id = $network_port->add($port_input, [], $dohistory);
+ $networkports_id = $network_port->add($port_input, [], $install_network_history);
if ($networkports_id === false) {
return -1;
}
$inst_input['networkports_id'] = $networkports_id;
$instantiation = $network_port->getInstantiation();
- $instantiation->update($inst_input, $dohistory);
+ $instantiation->update($inst_input, $install_network_history);
unset($instantiation);
} else {
@@ -121,7 +130,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$port_input = ['id' => $network_port->getID(),
'name' => $name,
'is_dynamic' => 1];
- $network_port->update($port_input, $dohistory);
+ $network_port->update($port_input, $install_network_history);
}
if (($network_port->fields['instantiation_type'] != $instantiation_type)
&& ($network_port->fields['is_dynamic'] == 1)) {
@@ -135,7 +144,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$instantiation = $network_port->getInstantiation();
$inst_input['id'] = $instantiation->getID();
$inst_input['networkports_id'] = $network_port->getID();
- $instantiation->update($inst_input, $dohistory);
+ $instantiation->update($inst_input, $install_network_history);
unset($instantiation);
}
}
@@ -153,7 +162,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
if ((!$ips) || (count($ips) == 0)) {
foreach ($DB->request($query) as $line) {
if ($line['is_dynamic']) {
- $network_name->delete($line, true, $dohistory);
+ $network_name->delete($line, true, $uninstall_network_history);
}
}
} else {
@@ -163,7 +172,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
'items_id' => $networkports_id,
'is_dynamic' => 1,
'is_deleted' => 0,
- '_no_history' => !$dohistory,
+ '_no_history' => !$install_network_history,
'name' => 'OCS-INVENTORY-NG'];
$networknames_id = $network_name->add($name_input);
} else {
@@ -171,7 +180,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$networknames_id = $line['id'];
foreach ($names as $line) {
if (($line['is_dynamic'] == 1) && ($line['id'] != $networknames_id)) {
- $network_port->delete($line, true, $dohistory);
+ $network_port->delete($line, true, $uninstall_network_history);
}
}
}
@@ -189,7 +198,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$already_known_addresses[] = $line['id'];
$ips = array_diff($ips, [$line['name']]);
} else if ($line['is_dynamic'] == 1) {
- $ip_address->delete($line, true, $dohistory);
+ $ip_address->delete($line, true, $uninstall_network_history);
}
}
}
@@ -228,7 +237,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
}
$IPNetwork->networkUpdate = true;
- $IPNetwork->add($input, [], !$dohistory);
+ $IPNetwork->add($input, [], $install_network_history);
}
}
@@ -237,7 +246,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$ip_input = ['name' => $ip,
'itemtype' => 'NetworkName',
'items_id' => $networknames_id,
- '_no_history' => !$dohistory,
+ '_no_history' => !$install_network_history,
'is_dynamic' => 1,
'is_deleted' => 0];
$ip_address->add($ip_input);
@@ -258,6 +267,17 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_id) {
global $DB;
+
+ $install_devices_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_devices'] == 1 || $cfg_ocs['history_devices'] == 2)) {
+ $install_devices_history = 1;
+ }
+
+ $uninstall_network_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_network'] == 1 || $cfg_ocs['history_network'] == 3)) {
+ $uninstall_network_history = 1;
+ }
+
// Group by DESCRIPTION, MACADDR, TYPE, TYPEMIB, SPEED, VIRTUALDEV
// to get an array in IPADDRESS
$ocsNetworks = [];
@@ -360,18 +380,18 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
'entities_id' => $entities_id,
'devicenetworkcards_id' => $net_id,
'mac' => $mac,
- '_no_history' => !$cfg_ocs['history_devices'],
+ '_no_history' => !$install_devices_history,
'is_dynamic' => 1,
- 'is_deleted' => 0], $cfg_ocs['history_devices']);
+ 'is_deleted' => 0], $install_devices_history);
} else {
$item_device->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicenetworkcards_id' => $net_id,
'mac' => $mac,
- '_no_history' => !$cfg_ocs['history_devices'],
+ '_no_history' => !$install_devices_history,
'is_dynamic' => 1,
- 'is_deleted' => 0], [], $cfg_ocs['history_devices']);
+ 'is_deleted' => 0], [], $install_devices_history);
}
}
}
@@ -404,7 +424,7 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
$networkports_id = self::updateNetworkPort($mac, $main['name'], $computers_id,
$type->fields['instantiation_type'],
$inst_input, $main['ip'], false,
- $cfg_ocs['history_network'],
+ $cfg_ocs,
$already_known_ports,
$mask, $gateway, $subnet, $entities_id);
@@ -426,7 +446,7 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
$inst_input = ['networkports_id_alias' => $networkports_id];
$id = self::updateNetworkPort($mac, $port['name'], $computers_id,
'NetworkPortAlias', $inst_input, $port['ip'],
- true, $cfg_ocs['history_network'], $already_known_ports,
+ true, $cfg_ocs, $already_known_ports,
$mask, $gateway, $subnet, $entities_id);
if ($id > 0) {
$already_known_ports[] = $id;
@@ -444,7 +464,7 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
}
$network_ports = new NetworkPort();
foreach ($DB->request($query) as $line) {
- $network_ports->delete($line, true, $cfg_ocs['history_network']);
+ $network_ports->delete($line, true, $uninstall_network_history);
}
$query = "SELECT `id`
@@ -457,7 +477,7 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
}
$item_device = new Item_DeviceNetworkCard();
foreach ($DB->request($query) as $line) {
- $item_device->delete($line, true, $cfg_ocs['history_network']);
+ $item_device->delete($line, true, $uninstall_network_history);
}
}
diff --git a/inc/networkshare.class.php b/inc/networkshare.class.php
index e64fcdcf..dd4b4725 100644
--- a/inc/networkshare.class.php
+++ b/inc/networkshare.class.php
@@ -68,10 +68,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateNetworkshare($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateNetworkshare($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetNetworkshare($computers_id, $history_plugins);
+ self::resetNetworkshare($computers_id, $uninstall_history);
}
$ocsShares = new self();
@@ -88,7 +97,7 @@ static function updateNetworkshare($computers_id, $ocsComputer, $history_plugins
$input["size"] = $sha["SIZE"];
$input["freespace"] = $sha["FREESPACE"];
$input["quota"] = $sha["QUOTA"];
- $ocsShares->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $ocsShares->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -98,13 +107,13 @@ static function updateNetworkshare($computers_id, $ocsComputer, $history_plugins
* Delete old Networkshare entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetNetworkshare($glpi_computers_id, $history_plugins) {
+ static function resetNetworkshare($glpi_computers_id, $uninstall_history) {
$share = new self();
- $share->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $share->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/ocsadmininfoslink.class.php b/inc/ocsadmininfoslink.class.php
index b88485e1..0c628267 100644
--- a/inc/ocsadmininfoslink.class.php
+++ b/inc/ocsadmininfoslink.class.php
@@ -116,7 +116,7 @@ static function getAdministrativeInfosLockableFields($plugin_ocsinventoryng_ocss
*
* @return array
*/
- static function addInfocomsForComputer($computers_id, $date, $computer_updates) {
+ static function addInfocomsForComputer($computers_id, $date, $computer_updates, $history) {
global $DB;
$infocom = new Infocom();
@@ -127,13 +127,13 @@ static function addInfocomsForComputer($computers_id, $date, $computer_updates)
|| $infocom->fields['use_date'] == 'NULL') {
//add use_date
$infocom->update(['id' => $infocom->fields['id'],
- 'use_date' => $use_date]);
+ 'use_date' => $use_date], $history);
}
} else {
//add infocom
$infocom->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
- 'use_date' => $use_date]);
+ 'use_date' => $use_date], [], $history);
}
@@ -267,7 +267,12 @@ static function updateAdministrativeInfo($params) {
$entities_id = $params['entities_id'];
$computers_id = $params['computers_id'];
-// PluginOcsinventoryngOcsServer::checkOCSconnection($plugin_ocsinventoryng_ocsservers_id);
+ $update_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && $cfg_ocs['history_admininfos'] == 1) {
+ $update_history = 1;
+ }
+
+ // PluginOcsinventoryngOcsServer::checkOCSconnection($plugin_ocsinventoryng_ocsservers_id);
$ocsClient = PluginOcsinventoryngOcsServer::getDBocs($plugin_ocsinventoryng_ocsservers_id);
//check link between ocs and glpi column
$queryListUpdate = "SELECT `ocs_column`, `glpi_column`
@@ -317,7 +322,7 @@ static function updateAdministrativeInfo($params) {
$input["id"] = $computers_id;
$input["entities_id"] = $entities_id;
$input["_nolock"] = true;
- $comp->update($input, $cfg_ocs['history_admininfos']);
+ $comp->update($input, $update_history);
}
if ($computer_updates
@@ -340,7 +345,7 @@ static function updateAdministrativeInfo($params) {
$input["id"] = $computers_id;
$input["entities_id"] = $entities_id;
$input["_nolock"] = true;
- $comp->update($input, $cfg_ocs['history_admininfos']);
+ $comp->update($input, $update_history);
}
}
}
@@ -400,11 +405,16 @@ static function importGroup($value, $entities_id) {
* @internal param bool $dohistory : log changes?
*/
static function updateAdministrativeInfoUseDate($computers_id, $plugin_ocsinventoryng_ocsservers_id,
- &$computer_updates, $ocsComputer) {
+ &$computer_updates, $ocsComputer, $cfg_ocs) {
+
+ $update_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && $cfg_ocs['history_admininfos'] == 1) {
+ $update_history = 1;
+ }
$ocsAdminInfosLink = new PluginOcsinventoryngOcsAdminInfosLink();
if ($ocsAdminInfosLink->getFromDBByCrit(['plugin_ocsinventoryng_ocsservers_id' => $plugin_ocsinventoryng_ocsservers_id,
- 'glpi_column' => 'use_date'])) {
+ 'glpi_column' => 'use_date'])) {
$ocs_column = $ocsAdminInfosLink->getField('ocs_column');
if ($computer_updates
@@ -416,9 +426,10 @@ static function updateAdministrativeInfoUseDate($computers_id, $plugin_ocsinvent
$var = "";
}
$date = str_replace($ocsComputer['NAME'] . "-", "", $var);
- $computer_updates = PluginOcsinventoryngOcsAdminInfosLink::addInfocomsForComputer($computers_id,
- $date,
- $computer_updates);
+ $computer_updates = self::addInfocomsForComputer($computers_id,
+ $date,
+ $computer_updates,
+ $update_history);
}
}
}
diff --git a/inc/ocslink.class.php b/inc/ocslink.class.php
index 34cb600d..d1ebb4ad 100644
--- a/inc/ocslink.class.php
+++ b/inc/ocslink.class.php
@@ -1284,7 +1284,6 @@ static function updateLock($plugin_ocsinventoryng_ocsservers_id, $computers_id,
'computers_updates' => $locks,
'ocs_id' => $ocsid,
'entities_id' => $comp->fields['entities_id'],
- 'dohistory' => $cfg_ocs['history_hardware'],
'HARDWARE' => $ocsComputer['HARDWARE'],
'BIOS' => $ocsComputer['BIOS'],
'force' => 0,
@@ -1330,7 +1329,7 @@ static function updateLock($plugin_ocsinventoryng_ocsservers_id, $computers_id,
'groups_id' => $groups_id],
['ocsid' => $ocsid]);
- PluginOcsinventoryngHardware::updateComputerFields($params, $data, $cfg_ocs['history_hardware']);
+ PluginOcsinventoryngHardware::updateComputerFields($params, $data, $cfg_ocs);
}
}
}
diff --git a/inc/ocsprocess.class.php b/inc/ocsprocess.class.php
index cb4eca8e..4fc0513b 100644
--- a/inc/ocsprocess.class.php
+++ b/inc/ocsprocess.class.php
@@ -608,11 +608,13 @@ static function importComputer($import_params) {
//ADD IF NOT LINKED
$computers_id = $comp->add($input, ['unicity_error_message' => false]);
if ($computers_id) {
- $ocsid = $computer['META']['ID'];
- $changes[0] = '0';
- $changes[1] = "";
- $changes[2] = $ocsid;
- PluginOcsinventoryngOcslink::history($computers_id, $changes, PluginOcsinventoryngOcslink::HISTORY_OCS_IMPORT);
+ if ($cfg_ocs['dohistory'] == 1) {
+ $ocsid = $computer['META']['ID'];
+ $changes[0] = '0';
+ $changes[1] = "";
+ $changes[2] = $ocsid;
+ PluginOcsinventoryngOcslink::history($computers_id, $changes, PluginOcsinventoryngOcslink::HISTORY_OCS_IMPORT);
+ }
$link_params = ['ocsid' => $computer['META']['ID'],
'plugin_ocsinventoryng_ocsservers_id' => $plugin_ocsinventoryng_ocsservers_id,
@@ -687,14 +689,16 @@ static function linkComputer($link_params) {
WHERE `id` = " . $data["id"];
if ($DB->query($query)) {
- $ocs_id_change = true;
- //Add history to indicates that the ocsid changed
- $changes[0] = '0';
- //Old ocsid
- $changes[1] = $data["ocsid"];
- //New ocsid
- $changes[2] = $ocsid;
- PluginOcsinventoryngOcslink::history($computers_id, $changes, PluginOcsinventoryngOcslink::HISTORY_OCS_IDCHANGED);
+ if ($cfg_ocs['dohistory'] == 1) {
+ $ocs_id_change = true;
+ //Add history to indicates that the ocsid changed
+ $changes[0] = '0';
+ //Old ocsid
+ $changes[1] = $data["ocsid"];
+ //New ocsid
+ $changes[2] = $ocsid;
+ PluginOcsinventoryngOcslink::history($computers_id, $changes, PluginOcsinventoryngOcslink::HISTORY_OCS_IDCHANGED);
+ }
}
}
}
@@ -759,14 +763,21 @@ static function linkComputer($link_params) {
&& ($ocsConfig["states_id_default"] > 0))) {
$input["states_id"] = $ocsConfig["states_id_default"];
}
- $comp->update($input, $cfg_ocs['history_hardware']);
+ $update_history = 0;
+ $input["_no_history"] = 1;
+ if ($cfg_ocs['dohistory'] == 1 && $cfg_ocs['history_hardware'] == 1) {
+ $update_history = 1;
+ $input["_no_history"] = 0;
+ }
+
+ $comp->update($input, $update_history);
// Auto restore if deleted
if ($comp->fields['is_deleted']) {
$comp->restore(['id' => $computers_id]);
}
- if ($ocs_id_change) {
+ if ($ocs_id_change && $cfg_ocs['dohistory'] == 1) {
$changes[0] = '0';
$changes[1] = "";
$changes[2] = $ocsid;
@@ -841,7 +852,7 @@ static function transferComputer($line_links) {
}
//If location is update by a rule
- PluginOcsinventoryngHardware::updateComputerFields($line_links, $data, $cfg_ocs['history_hardware']);
+ PluginOcsinventoryngHardware::updateComputerFields($line_links, $data, $cfg_ocs);
}
/** Update a ocs computer
@@ -909,7 +920,7 @@ static function synchronizeComputer($sync_params) {
'groups_id' => $groups_id],
['ocsid' => $line["ocsid"]]);
- PluginOcsinventoryngHardware::updateComputerFields($line, $data, $cfg_ocs['history_hardware']);
+ PluginOcsinventoryngHardware::updateComputerFields($line, $data, $cfg_ocs);
}
// update last_update and and last_ocs_update
@@ -975,7 +986,8 @@ static function synchronizeComputer($sync_params) {
if ($mixed_checksum & pow(2, self::BIOS_FL)) {
$updates['bios'] = true;
$ocsCheck[] = PluginOcsinventoryngOcsClient::CHECKSUM_BIOS;
- if ($cfg_ocs["import_device_motherboard"] && $cfg_ocs['ocs_version'] >= PluginOcsinventoryngOcsServer::OCS2_2_VERSION_LIMIT) {
+ if ($cfg_ocs["import_device_motherboard"]
+ && $cfg_ocs['ocs_version'] >= PluginOcsinventoryngOcsServer::OCS2_2_VERSION_LIMIT) {
$updates['mb'] = true;
}
}
@@ -1182,7 +1194,6 @@ static function synchronizeComputer($sync_params) {
'computers_updates' => $computer_updates,
'ocs_id' => $line['ocsid'],
'entities_id' => $comp->fields['entities_id'],
- 'dohistory' => true,
'check_history' => true];
if (isset($ocsComputer['ACCOUNTINFO'])) {
@@ -1193,7 +1204,8 @@ static function synchronizeComputer($sync_params) {
PluginOcsinventoryngOcsAdminInfosLink::updateAdministrativeInfoUseDate($line['computers_id'],
$plugin_ocsinventoryng_ocsservers_id,
$computer_updates,
- $ocsComputer['HARDWARE']);
+ $ocsComputer['HARDWARE'],
+ $cfg_ocs);
}
//Update TAG
@@ -1204,8 +1216,7 @@ static function synchronizeComputer($sync_params) {
$params['force'] = $force;
if ($updates['hardware']) {
- $params['dohistory'] = $cfg_ocs['history_hardware'];
- $params['HARDWARE'] = $ocsComputer['HARDWARE'];
+ $params['HARDWARE'] = $ocsComputer['HARDWARE'];
$params['check_history'] = true;
if ($force) {
@@ -1305,17 +1316,17 @@ static function synchronizeComputer($sync_params) {
//import drives
PluginOcsinventoryngDisk::updateDisk($line['computers_id'], $ocsComputer["DRIVES"],
$plugin_ocsinventoryng_ocsservers_id,
- $cfg_ocs['history_drives'], $force);
+ $cfg_ocs, $force);
}
if ($updates['virtualmachines'] && isset($ocsComputer["VIRTUALMACHINES"])) {
//import vm
PluginOcsinventoryngVirtualmachine::updateVirtualMachine($line['computers_id'], $ocsComputer["VIRTUALMACHINES"],
- $plugin_ocsinventoryng_ocsservers_id, $cfg_ocs['history_vm'], $force);
+ $plugin_ocsinventoryng_ocsservers_id, $cfg_ocs, $force);
}
if ($updates['registry'] && isset($ocsComputer["REGISTRY"])) {
//import registry entries
PluginOcsinventoryngRegistryKey::updateRegistry($line['computers_id'], $ocsComputer["REGISTRY"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
/********************* PLUGINS *********************/
if ($updates['antivirus'] && isset($ocsComputer["SECURITYCENTER"])) {
@@ -1326,42 +1337,42 @@ static function synchronizeComputer($sync_params) {
if ($updates['winupdatestate'] && isset($ocsComputer["WINUPDATESTATE"])) {
//import winupdatestate entries
PluginOcsinventoryngWinupdate::updateWinupdatestate($line['computers_id'], $ocsComputer["WINUPDATESTATE"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['osinstall'] && isset($ocsComputer["OSINSTALL"])) {
//import osinstall entries
PluginOcsinventoryngOsinstall::updateOSInstall($line['computers_id'], $ocsComputer["OSINSTALL"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['proxysetting'] && isset($ocsComputer["NAVIGATORPROXYSETTING"])) {
//import proxysetting entries
PluginOcsinventoryngProxysetting::updateProxysetting($line['computers_id'], $ocsComputer["NAVIGATORPROXYSETTING"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['networkshare'] && isset($ocsComputer["NETWORKSHARE"])) {
//import networkshare entries
PluginOcsinventoryngNetworkshare::updateNetworkshare($line['computers_id'], $ocsComputer["NETWORKSHARE"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['runningprocess'] && isset($ocsComputer["RUNNINGPROCESS"])) {
//import runningprocess entries
PluginOcsinventoryngRunningprocess::updateRunningprocess($line['computers_id'], $ocsComputer["RUNNINGPROCESS"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['service'] && isset($ocsComputer["SERVICE"])) {
//import service entries
PluginOcsinventoryngService::updateService($line['computers_id'], $ocsComputer["SERVICE"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['winuser'] && isset($ocsComputer["WINUSERS"])) {
//import winusers entries
PluginOcsinventoryngWinuser::updateWinuser($line['computers_id'], $ocsComputer["WINUSERS"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['teamviewer'] && isset($ocsComputer["TEAMVIEWER"])) {
//import teamviewer entries
PluginOcsinventoryngTeamviewer::updateTeamviewer($line['computers_id'], $ocsComputer["TEAMVIEWER"],
- $cfg_ocs['history_plugins'], 1);
+ $cfg_ocs, 1);
}
if ($updates['uptime'] && isset($ocsComputer["UPTIME"])) {
//import uptime
diff --git a/inc/ocsserver.class.php b/inc/ocsserver.class.php
index bafbb351..31f861bf 100644
--- a/inc/ocsserver.class.php
+++ b/inc/ocsserver.class.php
@@ -1005,6 +1005,25 @@ function accordion(id, openall) {
echo "\n";
}
+ static function getHistoryValues() {
+
+ $values = [__('None'),
+ __('Installation / Update / Uninstallation', 'ocsinventoryng'),
+ __('Installation / Update', 'ocsinventoryng'),
+ __('Uninstallation', 'ocsinventoryng')];
+
+ return $values;
+ }
+
+ function showHistoryDropdown($name) {
+
+ $value = $this->fields[$name];
+ $values = self::getHistoryValues();
+ return Dropdown::showFromArray($name, $values, ['value' => $value]);
+
+ }
+
+
/**
* Print ocs history form
*
@@ -1093,46 +1112,47 @@ function form_init_all(value) {
echo " \n";
echo "
";
@@ -2256,7 +2276,7 @@ static function showComputersToAdd($show_params) {
$advanced = $show_params["import_mode"];
$check = $show_params["check"];
$start = $show_params["start"];
- $entities_id = $show_params["entities_id"];
+ $entities_id = $show_params["entities_id"];
$tolinked = $show_params["tolinked"];
self::checkOCSconnection($plugin_ocsinventoryng_ocsservers_id);
diff --git a/inc/officepack.class.php b/inc/officepack.class.php
index 49adfc9a..4dbdb230 100644
--- a/inc/officepack.class.php
+++ b/inc/officepack.class.php
@@ -63,6 +63,11 @@ class PluginOcsinventoryngOfficepack extends CommonDBChild {
static function updateOfficePack($computers_id, $softwares_id, $softwares_name, $softwareversions_id,
$entity, $ocsOfficePacks, $cfg_ocs, &$imported_licences) {
+ $install_plugins_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_plugins_history = 1;
+ }
+
foreach ($ocsOfficePacks as $ocsOfficePack) {
$ocsOfficePack = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($ocsOfficePack));
@@ -118,7 +123,7 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
$id_software_licenses = $software_licenses->getID();
} else {
$software_licenses->fields['softwares_id'] = $softwares_id;
- $id_software_licenses = $software_licenses->add($soft_l, [], $cfg_ocs['history_software']);
+ $id_software_licenses = $software_licenses->add($soft_l, [], $install_plugins_history);
}
if ($id_software_licenses) {
@@ -145,9 +150,9 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
* Delete old licenses software entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_plugins_history boolean
*/
- static function resetOfficePack($glpi_computers_id, $history_plugins) {
+ static function resetOfficePack($glpi_computers_id, $uninstall_plugins_history) {
global $DB;
$query = "SELECT *
@@ -174,15 +179,15 @@ static function resetOfficePack($glpi_computers_id, $history_plugins) {
if ($DB->result($result3, 0, 0) == 1) {
$soft = new Software();
- $soft->delete(['id' => $license->fields['softwares_id']], 1, $history_plugins);
+ $soft->delete(['id' => $license->fields['softwares_id']], 1, $uninstall_plugins_history);
}
- $license->delete(["id" => $data['softwarelicenses_id']], 0, $history_plugins);
+ $license->delete(["id" => $data['softwarelicenses_id']], 0, $uninstall_plugins_history);
}
}
$computer_softwarelicenses = new Computer_SoftwareVersion();
$computer_softwarelicenses->deleteByCriteria(['computers_id' => $glpi_computers_id],
- 0, $history_plugins);
+ 0, $uninstall_plugins_history);
}
}
}
diff --git a/inc/os.class.php b/inc/os.class.php
index 3013af91..5b12516b 100644
--- a/inc/os.class.php
+++ b/inc/os.class.php
@@ -113,12 +113,23 @@ static function getOSLockableFields($plugin_ocsinventoryng_ocsservers_id = 0) {
static function updateComputerOS($options = []) {
global $DB;
- $is_utf8 = $options['cfg_ocs']["ocs_db_utf8"];
- $ocsServerId = $options['plugin_ocsinventoryng_ocsservers_id'];
- $force = $options["force"];
- $options['do_history'] = $options['cfg_ocs']["history_hardware"];
+ $is_utf8 = $options['cfg_ocs']["ocs_db_utf8"];
+ $ocsServerId = $options['plugin_ocsinventoryng_ocsservers_id'];
+ $force = $options["force"];
+ $cfg_ocs = $options['cfg_ocs'];
if (isset($options['HARDWARE'])) {
+
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_os'] == 1 || $cfg_ocs['history_os'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_os'] == 1 || $cfg_ocs['history_os'] == 2)) {
+ $install_history = 1;
+ }
+
$hardware = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($options['HARDWARE']));
if ($options['check_history']) {
@@ -146,10 +157,9 @@ static function updateComputerOS($options = []) {
$computerOSSP = $data_computer["os_sp"];
//Do not log software history in case of OS or Service Pack change
- if (!$options['do_history']
- || $computerOS != $hardware["OSNAME"]
+ if ($computerOS != $hardware["OSNAME"]
|| $computerOSSP != $hardware["OSCOMMENTS"]) {
- $options['dohistory'] = 0;
+ $install_history = 0;
}
}
}
@@ -211,7 +221,7 @@ static function updateComputerOS($options = []) {
$device = new Item_OperatingSystem();
if ($force) {
- self::resetOS($options['computers_id'], $options['do_history']);
+ self::resetOS($options['computers_id'], $uninstall_history);
}
if ($id = $device->getFromDBByCrit(['items_id' => $options['computers_id'],
@@ -229,7 +239,7 @@ static function updateComputerOS($options = []) {
'_nolock' => true,
'is_dynamic' => 1,
'entities_id' => $options['entities_id']
- ], $options['dohistory']);
+ ], $install_history);
}
} else {
@@ -245,7 +255,7 @@ static function updateComputerOS($options = []) {
'_nolock' => true,
'is_dynamic' => 1,
'entities_id' => $options['entities_id']
- ], [], $options['dohistory']);
+ ], [], $install_history);
}
}
@@ -256,9 +266,10 @@ static function updateComputerOS($options = []) {
*
* @param $glpi_computers_id integer : glpi computer id.
* @param $history_hardware
+ *
* @return void .
*/
- static function resetOS($glpi_computers_id, $history_hardware) {
+ static function resetOS($glpi_computers_id, $uninstall_history) {
$linktype = 'Item_OperatingSystem';
@@ -266,7 +277,7 @@ static function resetOS($glpi_computers_id, $history_hardware) {
$item->deleteByCriteria(['items_id' => $glpi_computers_id,
'itemtype' => 'Computer',
'is_dynamic' => 1
- ], 1, $history_hardware
+ ], 1, $uninstall_history
);
}
}
diff --git a/inc/osinstall.class.php b/inc/osinstall.class.php
index 7ad7a260..1687549c 100644
--- a/inc/osinstall.class.php
+++ b/inc/osinstall.class.php
@@ -69,10 +69,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateOSInstall($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateOSInstall($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetOSInstall($computers_id, $history_plugins);
+ self::resetOSInstall($computers_id, $uninstall_history);
}
//update data
if (!empty($ocsComputer)) {
@@ -88,7 +97,7 @@ static function updateOSInstall($computers_id, $ocsComputer, $history_plugins, $
$input["curtimezone"] = $os["CURTIMEZONE"];
$input["locale"] = $os["LOCALE"];
$osinstall = new self();
- $osinstall->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $osinstall->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -97,13 +106,13 @@ static function updateOSInstall($computers_id, $ocsComputer, $history_plugins, $
* Delete old osinstall entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetOSInstall($glpi_computers_id, $history_plugins) {
+ static function resetOSInstall($glpi_computers_id, $uninstall_history) {
$os = new self();
- $os->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $os->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/peripheral.class.php b/inc/peripheral.class.php
index 7689db63..5c1c4174 100644
--- a/inc/peripheral.class.php
+++ b/inc/peripheral.class.php
@@ -63,8 +63,17 @@ static function importPeripheral($periph_params) {
$entity = $periph_params["entities_id"];
$force = $periph_params["force"];
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_peripheral'] == 1 || $cfg_ocs['history_peripheral'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_peripheral'] == 1 || $cfg_ocs['history_peripheral'] == 2)) {
+ $install_history = 1;
+ }
+
if ($force) {
- self::resetPeripherals($computers_id, $cfg_ocs['history_peripheral']);
+ self::resetPeripherals($computers_id, $uninstall_history);
}
$already_processed = [];
@@ -127,7 +136,7 @@ static function importPeripheral($periph_params) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_periph = $p->add($input, [], $cfg_ocs['history_peripheral']);
+ $id_periph = $p->add($input, [], $install_history);
}
} else if ($cfg_ocs["import_periph"] == 2) {
//Config says : manage peripherals as single units
@@ -138,7 +147,7 @@ static function importPeripheral($periph_params) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_periph = $p->add($input, [], $cfg_ocs['history_peripheral']);
+ $id_periph = $p->add($input, [], $install_history);
}
if ($id_periph) {
@@ -146,7 +155,7 @@ static function importPeripheral($periph_params) {
if ($conn->add(['computers_id' => $computers_id,
'itemtype' => 'Peripheral',
'items_id' => $id_periph,
- 'is_dynamic' => 1], [], $cfg_ocs['history_peripheral'])) {
+ 'is_dynamic' => 1], [], $install_history)) {
//Update column "is_deleted" set value to 0 and set status to default
$input = [];
$input["id"] = $id_periph;
@@ -155,7 +164,7 @@ static function importPeripheral($periph_params) {
if ($cfg_ocs["states_id_default"] > 0) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
- $p->update($input, $cfg_ocs['history_peripheral']);
+ $p->update($input, $install_history);
}
}
} else {
@@ -211,11 +220,11 @@ static function importPeripheral($periph_params) {
*
* @param $glpi_computers_id integer : glpi computer id.
*
- * @param $history_peripheral
+ * @param $uninstall_history
* @return void .
* @throws \GlpitestSQLError
*/
- static function resetPeripherals($glpi_computers_id, $history_peripheral) {
+ static function resetPeripherals($glpi_computers_id, $uninstall_history) {
global $DB;
$query = "SELECT *
@@ -229,7 +238,7 @@ static function resetPeripherals($glpi_computers_id, $history_peripheral) {
if ($DB->numrows($result) > 0) {
$conn = new Computer_Item();
while ($data = $DB->fetch_assoc($result)) {
- $conn->delete(['id' => $data['id'], '_no_history' => !$history_peripheral], true, $history_peripheral);
+ $conn->delete(['id' => $data['id'], '_no_history' => !$uninstall_history], true, $uninstall_history);
$query2 = "SELECT COUNT(*)
FROM `glpi_computers_items`
@@ -239,9 +248,9 @@ static function resetPeripherals($glpi_computers_id, $history_peripheral) {
if ($DB->result($result2, 0, 0) == 1) {
$per->delete(['id' => $data['items_id'],
- '_no_history' => !$history_peripheral],
+ '_no_history' => !$uninstall_history],
true,
- $history_peripheral);
+ $uninstall_history);
}
}
}
diff --git a/inc/printer.class.php b/inc/printer.class.php
index a4ee6c05..cf3985b2 100644
--- a/inc/printer.class.php
+++ b/inc/printer.class.php
@@ -63,9 +63,17 @@ static function importPrinter($printer_params) {
$entity = $printer_params["entities_id"];
$force = $printer_params["force"];
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_printer'] == 1 || $cfg_ocs['history_printer'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_printer'] == 1 || $cfg_ocs['history_printer'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- PluginOcsinventoryngPrinter::resetPrinters($computers_id, $cfg_ocs['history_printer']);
+ PluginOcsinventoryngPrinter::resetPrinters($computers_id, $uninstall_history);
}
$already_processed = [];
@@ -158,7 +166,7 @@ static function importPrinter($printer_params) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_printer = $p->add($input, [], $cfg_ocs['history_printer']);
+ $id_printer = $p->add($input, [], $install_history);
}
} else if ($management_process == 2) {
//Config says : manage printers as single units
@@ -171,7 +179,7 @@ static function importPrinter($printer_params) {
}
$input["entities_id"] = $entity;
$input['is_dynamic'] = 1;
- $id_printer = $p->add($input, [], $cfg_ocs['history_printer']);
+ $id_printer = $p->add($input, [], $install_history);
}
if ($id_printer) {
@@ -179,7 +187,7 @@ static function importPrinter($printer_params) {
$conn->add(['computers_id' => $computers_id,
'itemtype' => 'Printer',
'items_id' => $id_printer,
- 'is_dynamic' => 1], [], $cfg_ocs['history_printer']);
+ 'is_dynamic' => 1], [], $install_history);
//Update column "is_deleted" set value to 0 and set status to default
$input = [];
$input["id"] = $id_printer;
@@ -189,7 +197,7 @@ static function importPrinter($printer_params) {
if ($cfg_ocs["states_id_default"] > 0) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
- $p->update($input, $cfg_ocs['history_printer']);
+ $p->update($input, $install_history);
}
} else {
$already_processed[] = $id;
@@ -261,12 +269,12 @@ static function analyzePrinterPorts(&$printer_infos, $port = '') {
*
* @param $glpi_computers_id integer : glpi computer id.
*
- * @param $history_printer
+ * @param $uninstall_history
*
* @return void .
* @throws \GlpitestSQLError
*/
- static function resetPrinters($glpi_computers_id, $history_printer) {
+ static function resetPrinters($glpi_computers_id, $uninstall_history) {
global $DB;
$query = "SELECT *
@@ -280,7 +288,7 @@ static function resetPrinters($glpi_computers_id, $history_printer) {
$conn = new Computer_Item();
while ($data = $DB->fetch_assoc($result)) {
- $conn->delete(['id' => $data['id'], '_no_history' => !$history_printer], true, $history_printer);
+ $conn->delete(['id' => $data['id'], '_no_history' => !$uninstall_history], true, $uninstall_history);
$query2 = "SELECT COUNT(*)
FROM `glpi_computers_items`
@@ -290,7 +298,7 @@ static function resetPrinters($glpi_computers_id, $history_printer) {
$printer = new Printer();
if ($DB->result($result2, 0, 0) == 1) {
- $printer->delete(['id' => $data['items_id'], '_no_history' => !$history_printer], true, $history_printer);
+ $printer->delete(['id' => $data['items_id'], '_no_history' => !$uninstall_history], true, $uninstall_history);
}
}
}
diff --git a/inc/proxysetting.class.php b/inc/proxysetting.class.php
index 62e48749..1a5ebd56 100644
--- a/inc/proxysetting.class.php
+++ b/inc/proxysetting.class.php
@@ -68,10 +68,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateProxysetting($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateProxysetting($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetProxysetting($computers_id, $history_plugins);
+ self::resetProxysetting($computers_id, $uninstall_history);
}
$ProxySetting = new self();
@@ -91,7 +100,7 @@ static function updateProxysetting($computers_id, $ocsComputer, $history_plugins
if (isset($proxy["OVERRIDE"])) {
$input["override"] = $proxy["OVERRIDE"];
}
- $ProxySetting->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $ProxySetting->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -100,13 +109,13 @@ static function updateProxysetting($computers_id, $ocsComputer, $history_plugins
* Delete old Proxysetting entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetProxysetting($glpi_computers_id, $history_plugins) {
+ static function resetProxysetting($glpi_computers_id, $uninstall_history) {
$proxy = new self();
- $proxy->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $proxy->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/registrykey.class.php b/inc/registrykey.class.php
index 3a825c8b..9b8583ae 100644
--- a/inc/registrykey.class.php
+++ b/inc/registrykey.class.php
@@ -70,10 +70,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateRegistry($computers_id, $ocsComputer, $history_plugins, $force) {
- //before update, delete all entries about $computers_id
+ static function updateRegistry($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
+
if ($force) {
- self::resetRegistry($computers_id, $history_plugins);
+ self::resetRegistry($computers_id, $uninstall_history);
}
$reg = new self();
//update data
@@ -85,7 +94,7 @@ static function updateRegistry($computers_id, $ocsComputer, $history_plugins, $f
$input["value"] = $registry["regvalue"];
$input["path"] = $registry["regkey"];
$input["ocs_name"] = $registry["name"];
- $reg->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $reg->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -94,13 +103,13 @@ static function updateRegistry($computers_id, $ocsComputer, $history_plugins, $f
* Delete old registry entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
* */
- static function resetRegistry($glpi_computers_id, $history_plugins) {
+ static function resetRegistry($glpi_computers_id, $uninstall_history) {
$registry = new self();
- $registry->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $registry->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
/** Display registry values for a computer
diff --git a/inc/runningprocess.class.php b/inc/runningprocess.class.php
index ba03e03c..a728b24c 100644
--- a/inc/runningprocess.class.php
+++ b/inc/runningprocess.class.php
@@ -68,10 +68,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateRunningprocess($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateRunningprocess($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetRunningProcess($computers_id, $history_plugins);
+ self::resetRunningProcess($computers_id, $uninstall_history);
}
$Runningprocess = new self();
@@ -81,7 +90,7 @@ static function updateRunningprocess($computers_id, $ocsComputer, $history_plugi
$process = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($runningprocess));
$input = array_change_key_case($process, CASE_LOWER);
$input["computers_id"] = $computers_id;
- $Runningprocess->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $Runningprocess->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -89,13 +98,13 @@ static function updateRunningprocess($computers_id, $ocsComputer, $history_plugi
* Delete old Runningprocess entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetRunningProcess($glpi_computers_id, $history_plugins) {
+ static function resetRunningProcess($glpi_computers_id, $uninstall_history) {
$runningprocess = new self();
- $runningprocess->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $runningprocess->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/service.class.php b/inc/service.class.php
index d220ff7e..834769d2 100644
--- a/inc/service.class.php
+++ b/inc/service.class.php
@@ -68,10 +68,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateService($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateService($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetService($computers_id, $history_plugins);
+ self::resetService($computers_id, $uninstall_history);
}
$ocsService = new self();
@@ -83,7 +92,7 @@ static function updateService($computers_id, $ocsComputer, $history_plugins, $fo
$input = array_change_key_case($service, CASE_LOWER);
$input["computers_id"] = $computers_id;
- $ocsService->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $ocsService->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -91,13 +100,13 @@ static function updateService($computers_id, $ocsComputer, $history_plugins, $fo
* Delete old Services entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetService($glpi_computers_id, $history_plugins) {
+ static function resetService($glpi_computers_id, $uninstall_history) {
$service = new self();
- $service->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $service->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/software.class.php b/inc/software.class.php
index 7a612832..459bb833 100644
--- a/inc/software.class.php
+++ b/inc/software.class.php
@@ -63,11 +63,25 @@ class PluginOcsinventoryngSoftware extends CommonDBChild {
static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $officepack, $ocsOfficePack, $force = 0) {
global $DB;
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_software'] == 1 || $cfg_ocs['history_software'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_software'] == 1 || $cfg_ocs['history_software'] == 2)) {
+ $install_history = 1;
+ }
+
+ $uninstall_plugins_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_plugins_history = 1;
+ }
+
if ($force) {
- self::resetSoftwares($computers_id, $cfg_ocs['history_software']);
+ self::resetSoftwares($computers_id, $uninstall_history);
}
if ($officepack) {
- PluginOcsinventoryngOfficepack::resetOfficePack($computers_id, $cfg_ocs['history_plugins']);
+ PluginOcsinventoryngOfficepack::resetOfficePack($computers_id, $uninstall_plugins_history);
}
$is_utf8 = $cfg_ocs["ocs_db_utf8"];
@@ -215,10 +229,10 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
//Update version for this software
if ($versionID = self::updateVersion($isNewSoft, $modified_version,
$version_comments,
- $cfg_ocs['history_software']) == !false) {
+ $install_history) == !false) {
//Update version for this machine
self::updateSoftwareVersion($computers_id, $versionID, $installdate,
- $cfg_ocs['history_software']);
+ $install_history);
}
unset($imported[$id]);
} else {
@@ -230,7 +244,7 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
$versionID = self::importVersion($cfg_ocs, $isNewSoft, $modified_version, $version_comments);
//Install version for this machine
self::installSoftwareVersion($computers_id, $versionID, $installdate,
- $cfg_ocs['history_software']);
+ $install_history);
}
if ($officepack && count($ocsOfficePack) > 0) {
// Get import officepack
@@ -243,9 +257,9 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
}
foreach ($imported as $id => $unused) {
- $computer_softwareversion->delete(['id' => $id, '_no_history' => !$cfg_ocs['history_software']],
+ $computer_softwareversion->delete(['id' => $id, '_no_history' => !$uninstall_history],
true,
- $cfg_ocs['history_software']);
+ $uninstall_history);
// delete cause a getFromDB, so fields contains values
$verid = $computer_softwareversion->getField('softwareversions_id');
$dbu = new DbUtils();
@@ -262,9 +276,9 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
$soft->putInTrash($vers->fields['softwares_id'],
__('Software deleted by OCSNG synchronization', 'ocsinventoryng'));
}
- $vers->delete(["id" => $verid, '_no_history' => !$cfg_ocs['history_software']],
+ $vers->delete(["id" => $verid, '_no_history' => !$uninstall_history],
true,
- $cfg_ocs['history_software']);
+ $uninstall_history);
}
}
@@ -272,7 +286,7 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
$dbu = new DbUtils();
$computer_softwarelicenses = new Computer_SoftwareLicense();
foreach ($imported_licences as $id => $unused) {
- $computer_softwarelicenses->delete(['id' => $id], true, $cfg_ocs['history_software']);
+ $computer_softwarelicenses->delete(['id' => $id], true, $uninstall_history);
// delete cause a getFromDB, so fields contains values
$verid = $computer_softwarelicenses->getField('softwareversions_id');
@@ -375,6 +389,11 @@ static function updateVersion($software, $version, $comments, $dohistory) {
static function importVersion($cfg_ocs, $software, $version, $comments) {
global $DB;
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_software'] == 1 || $cfg_ocs['history_software'] == 3)) {
+ $install_history = 1;
+ }
+
$isNewVers = 0;
$query = "SELECT `id`
FROM `glpi_softwareversions`
@@ -394,7 +413,7 @@ static function importVersion($cfg_ocs, $software, $version, $comments) {
$input["softwares_id"] = $software;
$input["name"] = $version;
$input["comment"] = $comments;
- $isNewVers = $vers->add($input, [], $cfg_ocs['history_software']);
+ $isNewVers = $vers->add($input, [], $install_history);
}
return ($isNewVers);
@@ -439,11 +458,11 @@ static function installSoftwareVersion($computers_id, $softwareversions_id, $ins
*
* @param $glpi_computers_id integer : glpi computer id.
*
- * @param $history_software
+ * @param $uninstall_history
* @return void .
* @throws \GlpitestSQLError
*/
- static function resetSoftwares($glpi_computers_id, $history_software) {
+ static function resetSoftwares($glpi_computers_id, $uninstall_history) {
global $DB;
$query = "SELECT *
@@ -470,20 +489,20 @@ static function resetSoftwares($glpi_computers_id, $history_software) {
if ($DB->result($result3, 0, 0) == 1) {
$soft = new Software();
$soft->delete(['id' => $vers->fields['softwares_id'],
- '_no_history' => !$history_software],
+ '_no_history' => !$uninstall_history],
true,
- $history_software);
+ $uninstall_history);
}
$vers->delete(["id" => $data['softwareversions_id'],
- '_no_history' => !$history_software],
+ '_no_history' => !$uninstall_history],
true,
- $history_software);
+ $uninstall_history);
}
}
$csv = new Computer_SoftwareVersion();
$csv->deleteByCriteria(['computers_id' => $glpi_computers_id,
- 'is_dynamic' => 1], 1, $history_software);
+ 'is_dynamic' => 1], 1, $uninstall_history);
}
}
diff --git a/inc/teamviewer.class.php b/inc/teamviewer.class.php
index 3a67804a..2b0ecb4e 100644
--- a/inc/teamviewer.class.php
+++ b/inc/teamviewer.class.php
@@ -70,10 +70,20 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateTeamviewer($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateTeamviewer($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetTeamviewer($computers_id, $history_plugins);
+ self::resetTeamviewer($computers_id, $uninstall_history);
}
$CompTeam = new self();
@@ -82,7 +92,7 @@ static function updateTeamviewer($computers_id, $ocsComputer, $history_plugins,
$input["version"] = $ocsComputer["VERSION"];
$input["twid"] = $ocsComputer["TWID"];
- $CompTeam->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $CompTeam->add($input, ['disable_unicity_check' => true], $install_history);
}
@@ -90,13 +100,13 @@ static function updateTeamviewer($computers_id, $ocsComputer, $history_plugins,
* Delete old Teamviewer entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetTeamviewer($glpi_computers_id, $history_plugins) {
+ static function resetTeamviewer($glpi_computers_id, $uninstall_history) {
$team = new self();
- $team->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $team->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/virtualmachine.class.php b/inc/virtualmachine.class.php
index 83d037f1..8da14fd2 100644
--- a/inc/virtualmachine.class.php
+++ b/inc/virtualmachine.class.php
@@ -57,11 +57,20 @@ class PluginOcsinventoryngVirtualmachine extends CommonDBChild {
* @internal param unknown $ocsid
* @internal param unknown $dohistory
*/
- static function updateVirtualMachine($computers_id, $ocsComputer, $ocsservers_id, $history_vm, $force) {
+ static function updateVirtualMachine($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs, $force) {
global $DB;
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_vm'] == 1 || $cfg_ocs['history_vm'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_vm'] == 1 || $cfg_ocs['history_vm'] == 2)) {
+ $install_history = 1;
+ }
+
if ($force) {
- self::resetVirtualmachine($computers_id, $history_vm);
+ self::resetVirtualmachine($computers_id, $uninstall_history);
}
$already_processed = [];
@@ -106,14 +115,14 @@ static function updateVirtualMachine($computers_id, $ocsComputer, $ocsservers_id
}
if (!$id) {
$virtualmachine->reset();
- $id_vm = $virtualmachine->add($vm, [], $history_vm);
+ $id_vm = $virtualmachine->add($vm, [], $install_history);
if ($id_vm) {
$already_processed[] = $id_vm;
}
} else {
if ($virtualmachine->getFromDB($id)) {
$vm['id'] = $id;
- $virtualmachine->update($vm, $history_vm);
+ $virtualmachine->update($vm, $install_history);
}
$already_processed[] = $id;
}
@@ -132,21 +141,21 @@ static function updateVirtualMachine($computers_id, $ocsComputer, $ocsservers_id
//Delete all connexions
$virtualmachine->delete(['id' => $data['id'],
'_ocsservers_id' => $ocsservers_id,
- '_no_history' => !$history_vm],
+ '_no_history' => !$uninstall_history],
true,
- $history_vm);
+ $uninstall_history);
}
}
/**
* @param $glpi_computers_id
- * @param $history_vm
+ * @param $uninstall_history
*/
- static function resetVirtualmachine($glpi_computers_id, $history_vm) {
+ static function resetVirtualmachine($glpi_computers_id, $uninstall_history) {
$dd = new ComputerVirtualMachine();
$dd->deleteByCriteria(['computers_id' => $glpi_computers_id,
- 'is_dynamic' => 1], 1, $history_vm);
+ 'is_dynamic' => 1], 1, $uninstall_history);
}
}
diff --git a/inc/winupdate.class.php b/inc/winupdate.class.php
index ec4d0bdd..c99252cf 100644
--- a/inc/winupdate.class.php
+++ b/inc/winupdate.class.php
@@ -68,10 +68,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateWinupdatestate($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateWinupdatestate($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetWinupdatestate($computers_id, $history_plugins);
+ self::resetWinupdatestate($computers_id, $uninstall_history);
}
//update data
if (!empty($ocsComputer)) {
@@ -86,7 +95,7 @@ static function updateWinupdatestate($computers_id, $ocsComputer, $history_plugi
$input["downloadsuccesstime"] = $wupdate["DOWNLOADSUCCESSTIME"];
$CompWupdate = new self();
- $CompWupdate->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $CompWupdate->add($input, ['disable_unicity_check' => true], $install_history);
}
}
@@ -95,13 +104,13 @@ static function updateWinupdatestate($computers_id, $ocsComputer, $history_plugi
* Delete old Winupdatestate entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*
*/
- static function resetWinupdatestate($glpi_computers_id, $history_plugins) {
+ static function resetWinupdatestate($glpi_computers_id, $uninstall_history) {
$win = new self();
- $win->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $win->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/inc/winuser.class.php b/inc/winuser.class.php
index 5205b7f9..4cee8a96 100644
--- a/inc/winuser.class.php
+++ b/inc/winuser.class.php
@@ -68,10 +68,19 @@ function cleanDBonPurge() {
* @param $history_plugins boolean
* @param $force
*/
- static function updateWinuser($computers_id, $ocsComputer, $history_plugins, $force) {
+ static function updateWinuser($computers_id, $ocsComputer, $cfg_ocs, $force) {
+
+ $uninstall_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 3)) {
+ $uninstall_history = 1;
+ }
+ $install_history = 0;
+ if ($cfg_ocs['dohistory'] == 1 && ($cfg_ocs['history_plugins'] == 1 || $cfg_ocs['history_plugins'] == 2)) {
+ $install_history = 1;
+ }
if ($force) {
- self::resetWinuser($computers_id, $history_plugins);
+ self::resetWinuser($computers_id, $uninstall_history);
}
$winusers = new self();
//update data
@@ -87,7 +96,7 @@ static function updateWinuser($computers_id, $ocsComputer, $history_plugins, $fo
$input["disabled"] = (isset($wuser["TYPE"]) ? $wuser["DISABLED"] : '');
$input["sid"] = (isset($wuser["TYPE"]) ? $wuser["SID"] : '');
- $winusers->add($input, ['disable_unicity_check' => true], $history_plugins);
+ $winusers->add($input, ['disable_unicity_check' => true], $install_history);
}
}
}
@@ -96,12 +105,12 @@ static function updateWinuser($computers_id, $ocsComputer, $history_plugins, $fo
* Delete old Winuser entries
*
* @param $glpi_computers_id integer : glpi computer id.
- * @param $history_plugins boolean
+ * @param $uninstall_history boolean
*/
- static function resetWinuser($glpi_computers_id, $history_plugins) {
+ static function resetWinuser($glpi_computers_id, $uninstall_history) {
$wuser = new self();
- $wuser->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $history_plugins);
+ $wuser->deleteByCriteria(['computers_id' => $glpi_computers_id], 1, $uninstall_history);
}
diff --git a/install/mysql/1.5.2-empty.sql b/install/mysql/1.5.2-empty.sql
new file mode 100644
index 00000000..4f2cbfb6
--- /dev/null
+++ b/install/mysql/1.5.2-empty.sql
@@ -0,0 +1,518 @@
+### Dump table glpi_plugin_ocsinventoryng_ocsadmininfoslinks
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_ocsadmininfoslinks`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_ocsadmininfoslinks` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `glpi_column` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_column` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`),
+ KEY `plugin_ocsinventoryng_ocsservers_id` (`plugin_ocsinventoryng_ocsservers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+
+### Dump table glpi_plugin_ocsinventoryng_ocslinks
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_ocslinks`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_ocslinks` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` int(11) NOT NULL DEFAULT '0',
+ `ocsid` int(11) NOT NULL DEFAULT '0',
+ `ocs_deviceid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `use_auto_update` tinyint(1) NOT NULL DEFAULT '1',
+ `last_update` datetime DEFAULT NULL,
+ `last_ocs_update` datetime DEFAULT NULL,
+ `last_ocs_conn` datetime default NULL,
+ `ip_src` varchar(255) collate utf8_unicode_ci default NULL,
+ `computer_update` longtext COLLATE utf8_unicode_ci,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL DEFAULT '0',
+ `ocs_agent_version` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `entities_id` int(11) NOT NULL DEFAULT '0',
+ `tag` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `uptime` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unicity` (`plugin_ocsinventoryng_ocsservers_id`,`ocsid`),
+ KEY `last_update` (`last_update`),
+ KEY `ocs_deviceid` (`ocs_deviceid`),
+ KEY `last_ocs_update` (`plugin_ocsinventoryng_ocsservers_id`,`last_ocs_update`),
+ KEY `computers_id` (`computers_id`),
+ KEY `use_auto_update` (`use_auto_update`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+
+### Dump table glpi_plugin_ocsinventoryng_ocsservers
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_ocsservers`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_ocsservers` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_db_user` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_db_passwd` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_db_host` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_db_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_db_utf8` tinyint(1) NOT NULL DEFAULT '0',
+ `checksum` int(11) NOT NULL DEFAULT '0',
+ `import_periph` tinyint(1) NOT NULL DEFAULT '0',
+ `import_monitor` tinyint(1) NOT NULL DEFAULT '0',
+ `import_software` tinyint(1) NOT NULL DEFAULT '0',
+ `import_printer` tinyint(1) NOT NULL DEFAULT '0',
+ `import_general_name` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_os` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_serial` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_model` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_manufacturer` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_type` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_domain` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_contact` tinyint(1) NOT NULL DEFAULT '1',
+ `import_user` tinyint(1) NOT NULL DEFAULT '1',
+ `import_user_location` tinyint(1) NOT NULL DEFAULT '1',
+ `import_user_group` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_comment` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_processor` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_memory` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_hdd` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_iface` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_gfxcard` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_sound` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_drive` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_port` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_modem` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_bios` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_motherboard` tinyint(1) NOT NULL DEFAULT '1',
+ `import_registry` tinyint(1) NOT NULL DEFAULT '1',
+ `import_antivirus` tinyint(1) NOT NULL DEFAULT '0',
+ `import_officepack` tinyint(1) NOT NULL DEFAULT '0',
+ `import_winupdatestate` tinyint(1) NOT NULL DEFAULT '0',
+ `import_proxysetting` tinyint(1) NOT NULL DEFAULT '0',
+ `import_winusers` tinyint(1) NOT NULL DEFAULT '0',
+ `import_teamviewer` tinyint(1) NOT NULL DEFAULT '0',
+ `import_osinstall` TINYINT(1) NOT NULL DEFAULT '0',
+ `import_networkshare` TINYINT(1) NOT NULL DEFAULT '0',
+ `import_os_serial` tinyint(1) NOT NULL DEFAULT '1',
+ `import_ip` tinyint(1) NOT NULL DEFAULT '1',
+ `import_disk` tinyint(1) NOT NULL DEFAULT '1',
+ `import_monitor_comment` tinyint(1) NOT NULL DEFAULT '0',
+ `states_id_default` int(11) NOT NULL DEFAULT '0',
+ `tag_limit` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `tag_exclude` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `use_soft_dict` tinyint(1) NOT NULL DEFAULT '0',
+ `cron_sync_number` int(11) DEFAULT '1',
+ `deconnection_behavior` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `date_mod` datetime DEFAULT NULL,
+ `comment` text COLLATE utf8_unicode_ci,
+ `is_active` tinyint(1) NOT NULL DEFAULT '0',
+ `use_massimport` tinyint(1) NOT NULL DEFAULT '0',
+ `use_locks` tinyint(1) NOT NULL DEFAULT '1',
+ `deleted_behavior` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
+ `import_vms` tinyint(1) NOT NULL DEFAULT '1',
+ `import_general_uuid` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_controller` tinyint(1) NOT NULL DEFAULT '1',
+ `import_device_slot` tinyint(1) NOT NULL DEFAULT '1',
+ `ocs_version` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `conn_type` tinyint(1) NOT NULL DEFAULT '0',
+ `use_cleancron` tinyint(1) NOT NULL DEFAULT '0',
+ `action_cleancron` tinyint(1) NOT NULL DEFAULT '0',
+ `use_restorationcron` tinyint(1) NOT NULL DEFAULT '0',
+ `delay_restorationcron` int(11) NOT NULL DEFAULT '0',
+ `use_checkruleimportentity` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_name` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_serial` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_comment` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_contact` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_location` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_domain` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_manufacturer` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_createport` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_last_pages_counter` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_firmware` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_power` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_fan` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_printermemory` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_computernetworkcards` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_computermemory` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_computerprocessors` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_computersoftwares` tinyint(1) NOT NULL DEFAULT '0',
+ `importsnmp_computervm` tinyint(1) NOT NULL DEFAULT '0',
+ `import_runningprocess` TINYINT(1) NOT NULL DEFAULT '0',
+ `import_service` TINYINT(1) NOT NULL DEFAULT '0',
+ `import_uptime` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_name` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_serial` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_comment` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_contact` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_location` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_domain` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_manufacturer` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_createport` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_last_pages_counter` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_firmware` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_power` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_fan` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_printermemory` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_computernetworkcards` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_computermemory` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_computerprocessors` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_computersoftwares` tinyint(1) NOT NULL DEFAULT '0',
+ `linksnmp_computervm` tinyint(1) NOT NULL DEFAULT '0',
+ `dohistory` tinyint(1) NOT NULL DEFAULT '1',
+ `history_hardware` tinyint(1) NOT NULL DEFAULT '1',
+ `history_bios` tinyint(1) NOT NULL DEFAULT '1',
+ `history_drives` tinyint(1) NOT NULL DEFAULT '1',
+ `history_network` tinyint(1) NOT NULL DEFAULT '1',
+ `history_devices` tinyint(1) NOT NULL DEFAULT '1',
+ `history_monitor` tinyint(1) NOT NULL DEFAULT '1',
+ `history_printer` tinyint(1) NOT NULL DEFAULT '1',
+ `history_peripheral` tinyint(1) NOT NULL DEFAULT '1',
+ `history_software` tinyint(1) NOT NULL DEFAULT '1',
+ `history_vm` tinyint(1) NOT NULL DEFAULT '1',
+ `history_admininfos` tinyint(1) NOT NULL DEFAULT '1',
+ `history_plugins` tinyint(1) NOT NULL DEFAULT '1',
+ `history_os` tinyint(1) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`),
+ KEY `date_mod` (`date_mod`),
+ KEY `is_active` (`is_active`),
+ KEY `use_massimport` (`use_massimport`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_registrykeys
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_registrykeys`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_registrykeys` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` int(11) NOT NULL DEFAULT '0',
+ `hive` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `path` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `value` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `ocs_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_computerwinupdates
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_winupdates`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_winupdates` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` int(11) NOT NULL DEFAULT '0',
+ `entities_id` int(11) NOT NULL DEFAULT '0',
+ `auoptions` int(11) NOT NULL DEFAULT '0',
+ `scheduleinstalldate` datetime DEFAULT NULL,
+ `lastsuccesstime` datetime DEFAULT NULL,
+ `detectsuccesstime` datetime DEFAULT NULL,
+ `downloadsuccesstime` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_osinstalls
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_osinstalls`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_osinstalls` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` INT(11) NOT NULL DEFAULT '0',
+ `entities_id` int(11) NOT NULL DEFAULT '0',
+ `build_version` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `install_date` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `codeset` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `countrycode` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `oslanguage` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `curtimezone` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `locale` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_proxysettings
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_proxysettings`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_proxysettings` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` int(11) NOT NULL DEFAULT '0',
+ `entities_id` int(11) NOT NULL DEFAULT '0',
+ `user` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `enabled` int(11) NOT NULL DEFAULT '0',
+ `autoconfigurl` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `address` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `override` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_networkshares
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_networkshares`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_networkshares` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` INT(11) NOT NULL DEFAULT '0',
+ `entities_id` INT(11) NOT NULL DEFAULT '0',
+ `drive` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `path` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `size` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `freespace` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `quota` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_winusers
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_winusers`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_winusers` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` int(11) NOT NULL DEFAULT '0',
+ `entities_id` int(11) NOT NULL DEFAULT '0',
+ `name` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `type` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `description` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `disabled` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `sid` VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_teamviewers
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_teamviewers`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_teamviewers` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` int(11) NOT NULL DEFAULT '0',
+ `entities_id` int(11) NOT NULL DEFAULT '0',
+ `twid` varchar(255) DEFAULT NULL,
+ `version` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_networkports
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_networkports`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_networkports` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `networkports_id` int(11) NOT NULL DEFAULT '0',
+ `TYPE` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `TYPEMIB` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `items_devicenetworkcards_id` int(11) NOT NULL DEFAULT '0',
+ `speed` varchar(255) COLLATE utf8_unicode_ci DEFAULT '10mb/s',
+ `comment` text COLLATE utf8_unicode_ci,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `networkports_id` (`networkports_id`),
+ KEY `TYPE` (`TYPE`),
+ KEY `TYPEMIB` (`TYPEMIB`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+
+### Dump table glpi_plugin_ocsinventoryng_networkporttypes
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_networkporttypes`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_networkporttypes` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `name` varchar(255) DEFAULT NULL,
+ `OCS_TYPE` varchar(255) NOT NULL DEFAULT '',
+ `OCS_TYPEMIB` varchar(255) NOT NULL DEFAULT '',
+ `instantiation_type` varchar(255) DEFAULT NULL,
+ `type` varchar(10) COLLATE utf8_unicode_ci DEFAULT '' COMMENT 'T, LX, SX',
+ `speed` int(11) NULL DEFAULT '10' COMMENT 'Mbit/s: 10, 100, 1000, 10000',
+ `version` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'a, a/b, a/b/g, a/b/g/n, a/b/g/n/y',
+ `comment` text COLLATE utf8_unicode_ci,
+ PRIMARY KEY (`id`),
+ KEY `OCS_TYPE` (`OCS_TYPE`),
+ KEY `OCS_TYPEMIB` (`OCS_TYPEMIB`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_ocsservers_profiles
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_ocsservers_profiles`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_ocsservers_profiles` (
+ `id` int(11) NOT NULL auto_increment,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL default '0',
+ `profiles_id` int(11) NOT NULL default '0',
+ PRIMARY KEY (`id`),
+ KEY `plugin_ocsinventoryng_ocsservers_id` (`plugin_ocsinventoryng_ocsservers_id`),
+ KEY `profiles_id` (`profiles_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_threads`;
+CREATE TABLE IF NOT EXISTS `glpi_plugin_ocsinventoryng_threads` (
+ `id` int(11) NOT NULL auto_increment,
+ `threadid` int(11) NOT NULL default '0',
+ `start_time` datetime default NULL,
+ `end_time` datetime default NULL,
+ `status` int(11) NOT NULL default '0',
+ `error_msg` text NOT NULL,
+ `imported_machines_number` int(11) NOT NULL default '0',
+ `synchronized_machines_number` int(11) NOT NULL default '0',
+ `failed_rules_machines_number` int(11) NOT NULL default '0',
+ `linked_machines_number` int(11) NOT NULL default '0',
+ `notupdated_machines_number` int(11) NOT NULL default '0',
+ `not_unique_machines_number` int(11) NOT NULL default '0',
+ `link_refused_machines_number` int(11) NOT NULL default '0',
+ `total_number_machines` int(11) NOT NULL default '0',
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL default '1',
+ `processid` int(11) NOT NULL default '0',
+ `entities_id` int(11) NOT NULL DEFAULT 0,
+ `rules_id` int(11) NOT NULL DEFAULT 0,
+ PRIMARY KEY (`id`),
+ KEY `end_time` (`end_time`),
+ KEY `process_thread` (`processid`,`threadid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_configs`;
+CREATE TABLE IF NOT EXISTS `glpi_plugin_ocsinventoryng_configs` (
+ `id` int(11) NOT NULL auto_increment,
+ `thread_log_frequency` int(11) NOT NULL default '10',
+ `is_displayempty` int(1) NOT NULL default '1',
+ `import_limit` int(11) NOT NULL default '0',
+ `delay_refresh` int(11) NOT NULL default '0',
+ `allow_ocs_update` tinyint(1) NOT NULL default '0',
+ `log_imported_computers` tinyint(1) NOT NULL default '0',
+ `comment` text,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_details`;
+CREATE TABLE IF NOT EXISTS `glpi_plugin_ocsinventoryng_details` (
+ `id` int(11) NOT NULL auto_increment,
+ `entities_id` int(11) NOT NULL default '0',
+ `plugin_ocsinventoryng_threads_id` int(11) NOT NULL default '0',
+ `rules_id` TEXT,
+ `threadid` int(11) NOT NULL default '0',
+ `ocsid` int(11) NOT NULL default '0',
+ `computers_id` int(11) NOT NULL default '0',
+ `action` int(11) NOT NULL default '0',
+ `process_time` datetime DEFAULT NULL,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL default '1',
+ PRIMARY KEY (`id`),
+ KEY `end_time` (`process_time`),
+ KEY `process_thread` (`plugin_ocsinventoryng_threads_id`,`threadid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_notimportedcomputers`;
+CREATE TABLE IF NOT EXISTS `glpi_plugin_ocsinventoryng_notimportedcomputers` (
+ `id` INT( 11 ) NOT NULL auto_increment,
+ `entities_id` int(11) NOT NULL default '0',
+ `rules_id` TEXT,
+ `comment` text NULL,
+ `ocsid` INT( 11 ) NOT NULL DEFAULT '0',
+ `plugin_ocsinventoryng_ocsservers_id` INT( 11 ) NOT NULL ,
+ `ocs_deviceid` VARCHAR( 255 ) NOT NULL ,
+ `useragent` VARCHAR( 255 ) NOT NULL ,
+ `tag` VARCHAR( 255 ) NOT NULL ,
+ `serial` VARCHAR( 255 ) NOT NULL ,
+ `name` VARCHAR( 255 ) NOT NULL ,
+ `ipaddr` VARCHAR( 255 ) NOT NULL ,
+ `domain` VARCHAR( 255 ) NOT NULL ,
+ `last_inventory` DATETIME ,
+ `reason` INT( 11 ) NOT NULL ,
+ PRIMARY KEY ( `id` ),
+ UNIQUE KEY `ocs_id` (`plugin_ocsinventoryng_ocsservers_id`,`ocsid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_servers`;
+CREATE TABLE IF NOT EXISTS `glpi_plugin_ocsinventoryng_servers` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL DEFAULT '0',
+ `max_ocsid` int(11) DEFAULT NULL,
+ `max_glpidate` datetime DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `plugin_ocsinventoryng_ocsservers_id` (`plugin_ocsinventoryng_ocsservers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_snmpocslinks
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_snmpocslinks`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_snmpocslinks` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `items_id` int(11) NOT NULL DEFAULT '0',
+ `ocs_id` int(11) NOT NULL DEFAULT '0',
+ `itemtype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `last_update` DATETIME COLLATE utf8_unicode_ci DEFAULT NULL,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL DEFAULT '0',
+ `linked` tinyint(1) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_ipdiscoverlinks
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_ipdiscoverocslinks`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_ipdiscoverocslinks` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `items_id` int(11) NOT NULL,
+ `itemtype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `macaddress` varchar(255) COLLATE utf8_unicode_ci NOT NULL UNIQUE,
+ `last_update` DATETIME COLLATE utf8_unicode_ci DEFAULT NULL,
+ `subnet` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
+ `plugin_ocsinventoryng_ocsservers_id` int(11) NOT NULL DEFAULT '0',
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+### Dump table glpi_plugin_ocsinventoryng_ruleimportentities
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_ruleimportentities`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_ruleimportentities` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_runningprocesses`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_runningprocesses` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` INT(11) NOT NULL DEFAULT '0',
+ `cpuusage` VARCHAR(255) DEFAULT NULL,
+ `tty` VARCHAR(255) DEFAULT NULL,
+ `started` VARCHAR(15) DEFAULT NULL,
+ `virtualmemory` VARCHAR(255) DEFAULT NULL,
+ `processname` VARCHAR(255) DEFAULT NULL,
+ `processid` VARCHAR(255) DEFAULT NULL,
+ `username` VARCHAR(255) DEFAULT NULL,
+ `processmemory` VARCHAR(255) DEFAULT NULL,
+ `commandline` VARCHAR(255) DEFAULT NULL,
+ `description` VARCHAR(255) DEFAULT NULL,
+ `company` VARCHAR(255) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+DROP TABLE IF EXISTS `glpi_plugin_ocsinventoryng_services`;
+CREATE TABLE `glpi_plugin_ocsinventoryng_services` (
+ `id` INT(11) NOT NULL AUTO_INCREMENT,
+ `computers_id` INT(11) NOT NULL DEFAULT '0',
+ `svcname` VARCHAR(128) NOT NULL,
+ `svcdn` VARCHAR(255) NOT NULL,
+ `svcstate` VARCHAR(32) DEFAULT NULL,
+ `svcdesc` VARCHAR(1536) DEFAULT NULL,
+ `svcstartmode` VARCHAR(32) DEFAULT NULL,
+ `svcpath` VARCHAR(512) DEFAULT NULL,
+ `svcstartname` VARCHAR(128) DEFAULT NULL,
+ `svcexitcode` INTEGER DEFAULT NULL,
+ `svcspecexitcode` INTEGER DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `computers_id` (`computers_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+
+INSERT INTO `glpi_plugin_ocsinventoryng_configs`(`id`,`thread_log_frequency`,`is_displayempty`,`import_limit`) VALUES (1, 2, 1, 0);
+
+INSERT INTO `glpi_plugin_ocsinventoryng_networkporttypes` VALUES (NULL, 'Unkown port', '*', '*', 'PluginOcsinventoryngNetworkPort', NULL, NULL,NULL, NULL);
+INSERT INTO `glpi_plugin_ocsinventoryng_networkporttypes` VALUES (NULL, 'Ethernet port', 'Ethernet', '*', 'NetworkPortEthernet', 'T', 10,NULL, NULL);
+INSERT INTO `glpi_plugin_ocsinventoryng_networkporttypes` VALUES (NULL, 'Wifi port', 'Wifi', '*', 'NetworkPortWifi', NULL, NULL, 'a', NULL);
+INSERT INTO `glpi_plugin_ocsinventoryng_networkporttypes` VALUES (NULL, 'Loopback port', 'Local', '*', 'NetworkPortLocal', NULL, NULL, NULL, NULL);
+
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginOcsinventoryngOcsServer','3','1','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginOcsinventoryngOcsServer','19','2','0');
+INSERT INTO `glpi_displaypreferences` VALUES (NULL,'PluginOcsinventoryngOcsServer','6','3','0');
+INSERT INTO `glpi_displaypreferences` (`itemtype`, `num`, `rank`, `users_id`)
+ VALUES ('PluginOcsinventoryngNotimportedcomputer', 2, 1, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 3, 2, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 4, 3, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 5, 4, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 6, 5, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 7, 6, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 8, 7, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 9, 8, 0),
+ ('PluginOcsinventoryngNotimportedcomputer', 10, 9, 0),
+ ('PluginOcsinventoryngDetail', 5, 1, 0),
+ ('PluginOcsinventoryngDetail', 2, 2, 0),
+ ('PluginOcsinventoryngDetail', 3, 3, 0),
+ ('PluginOcsinventoryngDetail', 4, 4, 0),
+ ('PluginOcsinventoryngDetail', 6, 5, 0),
+ ('PluginOcsinventoryngDetail', 80, 6, 0);
diff --git a/locales/ar_SA.mo b/locales/ar_SA.mo
index 3d3dbd56..1b00f7f1 100644
Binary files a/locales/ar_SA.mo and b/locales/ar_SA.mo differ
diff --git a/locales/ar_SA.po b/locales/ar_SA.po
index 3779210e..6eb72f4e 100644
--- a/locales/ar_SA.po
+++ b/locales/ar_SA.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/ar_SA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,117 +18,121 @@ msgstr ""
"Language: ar_SA\n"
"Plural-Forms: nplurals=6; plural=(n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -139,29 +143,29 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
@@ -171,23 +175,23 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
@@ -197,43 +201,43 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -248,14 +252,14 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -263,7 +267,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -275,7 +279,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -288,10 +292,14 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
@@ -301,25 +309,25 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -378,21 +386,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -401,150 +409,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -582,28 +594,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -649,15 +661,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -675,15 +687,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -691,815 +703,820 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr ""
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr ""
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
@@ -1509,31 +1526,31 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1544,11 +1561,11 @@ msgstr[3] ""
msgstr[4] ""
msgstr[5] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1563,47 +1580,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1800,93 +1817,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1951,54 +1972,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/bg_BG.mo b/locales/bg_BG.mo
index 4c8d8c23..381705e4 100644
Binary files a/locales/bg_BG.mo and b/locales/bg_BG.mo differ
diff --git a/locales/bg_BG.po b/locales/bg_BG.po
index e6671327..43152827 100644
--- a/locales/bg_BG.po
+++ b/locales/bg_BG.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/bg_BG/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +18,214 @@ msgstr ""
"Language: bg_BG\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -232,14 +236,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Не се импортира: модула не импортира тези елементи"
@@ -247,7 +251,7 @@ msgstr "Не се импортира: модула не импортира те
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -259,7 +263,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -272,34 +276,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -354,21 +362,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -377,150 +385,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Дата на импортиране в системата GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Импортиране на нови копютри"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Синхронизация на вече импортираните компютри"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -558,28 +570,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -621,15 +633,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -647,15 +659,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -663,856 +675,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Опции за импорт"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Глобално импортиране"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Импорт по елементи"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Ограничи импорта до следните стойности на полетата на OCS (разделител $, празно за всички)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Статус по подразбиране"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr ""
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Обновяване на компютрите"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Импорт"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1527,47 +1544,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,93 +1781,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1915,54 +1936,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/ca_ES.mo b/locales/ca_ES.mo
index 358e2018..62c45ca1 100644
Binary files a/locales/ca_ES.mo and b/locales/ca_ES.mo differ
diff --git a/locales/ca_ES.po b/locales/ca_ES.po
index 6c018b1c..ba4ac923 100644
--- a/locales/ca_ES.po
+++ b/locales/ca_ES.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Catalan (Spain) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/ca_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +18,214 @@ msgstr ""
"Language: ca_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Ordinadors no importats per accions automàtiques"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Reinicia la importació"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importa en l'entitat"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Esborra ordinador a OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Força la sincronització OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Desbloqueja camps"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Actualitza els tipus de port de xarxa"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Data d'importació de GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Data de l'últim inventari OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Actualització automàtica d'OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agent d'inventari"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "Etiqueta OCSNG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "Identificador OCSNG"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registre"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Clau/valor"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nom OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "Servidor OCSNG"
msgstr[1] "Servidors OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Enllaç OCSNG"
msgstr[1] "Enllaços OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Enllaç possible"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Importació refusada"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nou ordinador creat en GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Enllaç amb ordinador"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Camp bloquejat"
msgstr[1] "Camps bloquejats"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Configuració de la sincronització automàtica"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Si et plau activa el connector"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "PC borrado"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "No hi ha nous ordinadors per esborrar"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Neteja ordinadors eliminats d'OCSNG"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Ordinadors importats per accions automàtiques"
@@ -232,14 +236,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Neteja enllaços entre GLPI i OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "No importar: GLPI no importarà aquests elements"
@@ -247,7 +251,7 @@ msgstr "No importar: GLPI no importarà aquests elements"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -259,7 +263,7 @@ msgstr "Informació al voltant del script "
msgid "Processes execution of automatic actions"
msgstr "Processa l'execució d'accions automàtiques"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Comprova el script d'importació d'OCSNG"
@@ -272,34 +276,38 @@ msgid "Authorize the OCSNG update"
msgstr "Autoritza l'actualització d'OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Actualitza la informació d'un procés cada"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "segon"
msgstr[1] "segons"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Bloqueig no activat"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Bloqueig activat"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Bloqueig"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Desbloqueig"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Tots els servidors"
@@ -354,21 +362,21 @@ msgstr "Fil"
msgid "Rules checked"
msgstr "Regles comprovades"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Ordinadors importats"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Ordinadors enllaçats"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Ordinadors no actualitzats"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Ordinadors sincronitzats"
@@ -377,150 +385,154 @@ msgstr "Ordinadors sincronitzats"
msgid "Computers not unique"
msgstr "Ordinadors no únics"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Intercanvi"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Tria un servidor OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Data d'importació a GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configuració del servidor OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importa nous ordinadors"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronització d'ordinadors ja importats"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Enllaça els nous ordinadors OCSNG als ordinadors existents GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Execució de scripts d'accions automàtiques"
@@ -558,28 +570,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "Tipus OCS"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS MIB TYPE"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Crea una entrada per a la definició d'aquest tipus"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Crea una cartografia"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "buit"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Tipus de port de xarxa d'OCS no desconegut!"
@@ -621,15 +633,15 @@ msgstr "Transforma ports desconeguts que coincideixen"
msgid "Create"
msgstr "Crea"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Camí"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -647,15 +659,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -663,856 +675,861 @@ msgstr ""
msgid "Verified rules"
msgstr "Regles verificades"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "No pot afectar a una entitat"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "El criteri d'unicitat no verificat"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Importació refusada per una regla"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Accions que es faran a l'ordinador"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Envia alerta de fallida dels ordinadors OCSNG no importats"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Alerta d'ordinadors no importats"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interfície OCS NG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Força la sincronització"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importat d'OSCNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Eliminat a l'OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Enllaçat amb un ordinador d'OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "L'identificador d'OSCNG de l'ordinador ha canviat de %1$s a %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "L'etiqueta d'OCSNG de l'ordinador ha canviat de %1$s a %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "No es pot importar, l'ordinador GLPI ja està relacionat amb un element d'OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Els ordinadors no comproven cap regla"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Ordinadors duplicats"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Ordinadors no importats perquè són rebutjats per una regla"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Estadístiques de l'enllaç OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opcions d'importació"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Consola OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Mode expert de sincronització"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Base de dades en UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configuració del servidor OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "El servidor seleccionat no està actiu. La importació i sincronització no està disponible"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informació general"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importació global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importació única"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Importació única basada en el número de sèrie"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Importació única només número de sèrie"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Importació global: tot és importat, però el material es gestiona a nivell global (sense duplicats)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Importació d'unitat: tot és importat tal com és"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informació administrativa d'OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL de la consola d'OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limita la importació a les etiquetes següents (separador $, res per a totes)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Exclou les següents etiquetes (separador $, res per a totes)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Estat predeterminat"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportament en desconnectar"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Utilitza el diccionari de programari d'OCS"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Quantitat d'elements a sincronitzar mitjançant cron"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportament de la supressió d'un ordinador a OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Canvia a l'estat %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Base de dades"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Estàndard (permetre accions manuals)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expert (completament automàtic, per configuració gran)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Tipus de connexió"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Amfitrió"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Mètode de sincronització"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Connectant a la base de dades"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "La connexió a la base de dades ha fallat"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versió d'OCSNG no vàlida: es necessita RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "La configuració d'OCSNG no és correcta. (TRACE_DELETED ha de ser activat)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Connexió exitosa a la base de dades"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Versió i configuració OCSNG vàlides"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "No es possible afegir. Ja hi ha servidor OCSNG."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "No es pot importar, l'ordinador GLPI ja està relacionat amb un element d'OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Intercanvi"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existeix a GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existeix a OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "No hi ha objectes per a netejar"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "No hi ha nous ordinadors per a ser actualitzats"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Ordinadors actualitzats a OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronitza"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Actualitza ordinadors"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "¡Precaució! Les dades importades (observa la teva configuració) sobrescriuran a les existents"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Mode d'importació manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Desactiva la vista prèvia"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activa la vista preliminar"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Comprova que els duplicats s'han gestionat correctament a OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importa"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Compleix la regla?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Lloc"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "No hi ha nous ordinadors per a ser importats"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Els ordinadors no comproven cap regla"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Ordinadors duplicats"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Ordinadors no importats perquè són rebutjats per una regla"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Estadístiques de l'enllaç OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Servidor OCSNG permés"
msgstr[1] "Servidors OCSNG permesos"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Sincronització manual"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Mira la informació"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d clau de registre trobada"
msgstr[1] "%d claus de registre trobades"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Rusc"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "No s'ha trobat cap clau en el Registre de Windows"
@@ -1527,47 +1544,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,93 +1781,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1915,54 +1936,54 @@ msgstr "Neteja processos"
msgid "Delete processes after"
msgstr "Elimina processos després"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo
index 1378afe3..a8517fee 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 66e97239..0438eea6 100644
--- a/locales/cs_CZ.po
+++ b/locales/cs_CZ.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Czech (Czech Republic) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/cs_CZ/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,117 +21,121 @@ msgstr ""
"Language: cs_CZ\n"
"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"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Počítače nenaimportované pomocí automatických akcí"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Spustit import znovu"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importovat v entitě"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Smazat počítač v OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Vynutit OCSNG synchronizaci"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Uzamknout kolonky"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Odemknout kolonky"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Aktualizovat typy síťových portů"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Datum importu do GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Datum poslední inventarizace v OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Automatická aktualizace OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agent pro inventarizaci"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG ŠTÍTEK"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG IDENTIFIKÁTOR"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Datum posledního připojení k OCSNG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "Zdroj IP adresy"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr "Doba běhu (uptime)"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registry"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Klíč/hodnota"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Název v OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -140,29 +144,29 @@ msgstr[1] "OCSNG servery"
msgstr[2] "OCSNG serverů"
msgstr[3] "OCSNG servery"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr "Proxy zapnuto"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "Adresa proxy"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr "Název služby"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr "Název procesu"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr "SNMP import"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "OCSNG odkaz"
@@ -170,23 +174,23 @@ msgstr[1] "OCSNG odkazy"
msgstr[2] "OCSNG odkazů"
msgstr[3] "OCSNG odkazy"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Propojení je možné"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Import odmítnut"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nový počítač vytvořený v GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Propojení s počítačem"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Zamknutá kolonka"
@@ -194,43 +198,43 @@ msgstr[1] "Zamknuté kolonky"
msgstr[2] "Zamknutých kolonek"
msgstr[3] "Zamknuté kolonky"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr "Nepoužíváte zámky – pro jejich aktivaci přejděte do nastavení"
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr "Datum začátku je uzamčeno ocsinventoryng – před aktualizací ho odemkněte"
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Nastavení automatické synchronizace"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Zapněte zásuvný modul"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "Počítač smazán"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Žádný nový počítač ke smazání"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Vyčistit počítač smazané v OCSNG"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Počítače naimportované pomocí automatických akcí"
@@ -243,14 +247,14 @@ msgstr[1] "Neznámé typy importovaných síťových portů"
msgstr[2] "Neznámých typů importovaných síťových portů"
msgstr[3] "Neznámé typy importovaných síťových portů"
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Vyčistit propojení mezi GLPI a OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Žádný import: zásuvný modul nebude tyto prvky importovat"
@@ -258,7 +262,7 @@ msgstr "Žádný import: zásuvný modul nebude tyto prvky importovat"
msgid "Successful link"
msgstr "Úspěšné propojení"
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr "Žádná synchronizace: zásuvný modul nebude tyto prvky importovat"
@@ -270,7 +274,7 @@ msgstr "Informace o skriptu"
msgid "Processes execution of automatic actions"
msgstr "Spuštění procesů automatických akcí"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Zkontrolujte importní skript OCSNG"
@@ -283,10 +287,14 @@ msgid "Authorize the OCSNG update"
msgstr "Schválit OCSNG aktualizaci"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Obnovit informace o procesu každých"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "sekunda"
@@ -294,25 +302,25 @@ msgstr[1] "sekundy"
msgstr[2] "sekund"
msgstr[3] "sekundy"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Zámek není aktivován"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Zámek aktivován"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Zamknout"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Odemknout"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Všechny servery"
@@ -369,21 +377,21 @@ msgstr "Vlákno"
msgid "Rules checked"
msgstr "Pravidla zkontrolována"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Naimportované počítače"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Propojené počítače"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Nezaktualizované počítače"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Synchronizované počítače"
@@ -392,150 +400,154 @@ msgstr "Synchronizované počítače"
msgid "Computers not unique"
msgstr "Počítače, které se opakují"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Swap"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr "Import IPDiscover"
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Vybrat server OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Pokud v tomto seznamu nenaleznete svůj OCSNG server, zkontrolujte zda je server přístupný vašemu profilu!"
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr "Importovat IPDiscover"
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr "Propojit IPDiscover"
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Všechny podsítě"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Známé podsítě"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Neznámé podsítě"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr "Nezinventarizováno"
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr "Zinventarizováno"
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr "Identifikováno"
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr "Importováno/propojeno"
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr "Upravit podsíť"
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Název podsítě"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Zvolte identifikátor"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Nedaří se přidat objekt se stejnou MAC adresou, která už existuje."
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr "Žádné nové zařízení k importu z IPDiscover"
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr "Smazat odkaz"
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Importovat data do GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr "Odkaz"
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "Vymazat z OCSNG"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "OCS typ"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr "GLPI typ"
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr "Položka kterou propojit"
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Nastavení OCSNG serveru"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importovat nové počítače"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synchronizovat už naimportované počítače"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Propojit nové počítače z OCSNG s existujícími počítači v GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Skripty spouštějící automatické akce"
@@ -573,28 +585,28 @@ msgstr "Je třeba nastavit OCSNG server"
msgid "Add a OCSNG server"
msgstr "Přidat OCSNG server"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "OCS TYP"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS MIB TYP"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Vytvoření položky pro definování tohoto typu"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Vytvořit mapování"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "prázdné"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Žádný neznámý typ síťového portu z OCS!"
@@ -638,15 +650,15 @@ msgstr "Přetvořit odpovídající neznámé porty"
msgid "Create"
msgstr "Vytvořit"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr "Síťová sdílení"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Cesta"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr "Kvóta"
@@ -664,15 +676,15 @@ msgstr "Prvky které se neshodují s pravidlem"
msgid "Elements not match with the rule by automatic actions"
msgstr "Prvky které neodpovídají pravidlu automatickými akcemi"
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr "Ověření pravidel přiřazení pro entity a umístění"
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr "Žádná shoda s pravidly"
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr "Chyba dat"
@@ -680,815 +692,820 @@ msgstr "Chyba dat"
msgid "Verified rules"
msgstr "Ověřená pravidla"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Nemůže ovlivnit entitu"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Kritéria jednoznačnosti nebyla ověřena"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Import odmítnut kvůli pravidlu"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Akce, které mají být na počítači provedeny"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Poslat upozornění v případě, že se nepodařilo naimportovat nějaké počítače z OCSNG"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Žádné várování importovaných počítačů"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr "Informace o importu OCS Inventory NG"
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Rozhraní OCS NG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Vynutit synchronizaci"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr "Informace o importu SNMP z OCS Inventory NG"
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr "Importovaný objekt"
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr "Propojený objekt"
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr "Vynutit synchronizaci SNMP"
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr "Datum minulé SNMP inventury z OCSNG"
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr "Informace o importu z IPDiscover OCS Inventory NG"
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr "Identifikátor zařízení v OCSNG"
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr "V databázi OCSNG nebyl nalezen žádný počítač"
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr "Zkouška kontrolního součtu"
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Naimportován z OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Smazáno v OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Spojeno s počítačem OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "OCSNG identifikátor počítače se změnil z %1$s na %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "OCSNG TAG počítače se změnil z %1$s na %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr "Není možné propojit tento počítač, sériové číslo se nachází na seznamu vyloučených (%d)"
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr "Není možné propojit tento počítač, neopakující se identifikátor je zařazen na seznamu vyloučených (%d)"
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Nelze importovat, počítač v GLPI je už spojen s položkou v OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Počítače nezkontrolované žádným pravidlem"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Duplicitní počítače"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Počítače, u kterých byl import odmítnut pravidlem"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr "SNMP objektů importováno"
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr "SNMP objektů synchronizováno"
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr "SNMP objektů připojeno"
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr "SNMP objektů neaktualizováno"
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr "SNMP objektů nenaimportováno"
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr "Objekty z IPDiscover importovány"
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr "Objekty z IPDiscover synchronizovány"
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr "Objekty z IPDiscover neaktualizovány"
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr "Objekty z IPDiscover nenaimporotovány"
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr "Statistiky importu SNMP z OCSNG"
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr "Statistiky IPDiscover importu z OCSNG"
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Statistiky OCSNG odkazu"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr "Data k importu"
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Volby importu"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr "Obecná historie"
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "OCSNG konzole"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Expertní režim synchronizace"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Databáze v UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Nastavení OCSNG serveru %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr "Nastavit engine pravidel"
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr "Nastavit pravidla pro volbu entity při importu položek"
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr "Nastavit pravidla pro výběr kritérií pro propojení položek"
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr "Viz nastavení: data pro import před"
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Vybraný server není aktivní. Import a synchronizace není k dispozici"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Obecné informace"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Varování: pravidla importovaní entit závisí na vybraných kolonkách"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Závisí na importování BIOS/UEFI"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr "Informace o uživateli"
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr "Uživatel kterého se týká z kontaktu"
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr "Závisí na importu kontaktu"
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr "Umístění uživatele kterého se týká ve výchozím stavu"
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr "Ve výchozím stavu se týká první skupiny uživatele"
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr "Po verzi 7006 OCS Inventory NG"
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr "Po verzi 7009 OCS Inventory NG && závisí na importu BIOS/UEFI"
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr "Propojené objekty"
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Globální import"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Import jednotky"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Import jednotky se sériovým číslem"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Import jednotky pouze sériového čísla"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Globální import: vše je naimportováno, ale materiál je globálně spravován (bez duplicit)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Jednotný import: všechno je naimportováno tak jak je"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr "Zásuvné moduly OCS Inventory NG"
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr "Licence Microsoft Office"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr "Závisí na importu software a zásuvném modulu OfficePack (https://github.com/PluginsOCSInventory-NG/officepack), nainstalovaném v OCSNG"
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr "Antivirus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Zabezpečení (https://github.com/PluginsOCSInventory-NG/security)"
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Uptime (https://github.com/PluginsOCSInventory-NG/uptime)"
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr "Stav Windows Update"
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Winupdate (https://github.com/PluginsOCSInventory-NG/winupdate)"
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul pro Teamviewer (https://github.com/PluginsOCSInventory-NG/security)"
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr "Nastavení proxy"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Nastavení Navigator Proxy (https://github.com/PluginsOCSInventory-NG/navigatorproxysetting)"
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr "Uživatelé Windows"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Winusers (https://github.com/PluginsOCSInventory-NG/winusers)"
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr "Informace o operačním systému"
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul OSInstall (https://github.com/PluginsOCSInventory-NG/osinstall)"
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Networkshare (https://github.com/PluginsOCSInventory-NG/networkshare)"
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr "Služba"
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Service (https://github.com/PluginsOCSInventory-NG/services)"
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr "Spuštěný proces"
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr "Je třeba, aby byl v OCSNG nainstalovaný zásuvný modul Running Process (https://github.com/PluginsOCSInventory-NG/runningProcess)"
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Administrativní informace OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr "Dělat historii"
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr "Historie systém"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr "Historie BIOS/UEFI"
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr "Historie zařízení"
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr "Historie svazků"
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr "Historie sítě"
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr "Historie připojení monitorů"
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr "Historie připojení tiskárny"
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr "Historie připojení periferie"
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr "Historie spojení software"
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr "Historie virtuálních strojů"
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr "Historie administrativních informací"
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
-msgstr ""
+msgstr "Historie zásuvného modulu"
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Webová adresa konzole OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Omezit import následujících příznaků (oddělovač $, nic pro všechny)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Vynechat následující příznaky (oddělovač $, zrušit vše)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Výchozí stav"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Chování při odpojení"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr "Zachovat odkaz"
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr "Umístit odkaz do Koše a přidat zámek"
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr "Smazat propojení natrvalo"
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr "Určit akci kterou udělat na propojení s ostatními objekty při odpojování počítače od nich"
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Použít slovník software OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr "Pokud je zaškrtnutý parametr „Použít číselník software z OCSNG“, nebude naimportován žádný software dokud ho nenastavíte v OCS"
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Počet položek pro synchronizaci pomocí automatizované akce OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr "Automatická úloha ocsng je spuštěna pouze pokud server není v expertním režimu"
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr "Automatická úloha ocsng synchronizuje pouze existující počítače, neimportuje nové"
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr "Pokud chcete importovat nové počítače, vypněte tento parametr, přepněte na expertní režim a použijte skript ze systému"
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Chování při smazání počítače v OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Změnit na stav %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Databáze"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standardní (umožňuje ruční akce)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expertní (plně automatická, pro velká nastavení)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Typ spojení"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr "Znovu načíst kontrolní součet"
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Hostitel"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "Jako http://127.0.0.1 pro metodu SOAP"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Metoda synchronizace"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr "Použít automatickou akci pro vyčištění starých agentů a zahození z OCSNG"
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr "Použít automatickou akci obnovit smazaný počítač"
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr "Počet dnů pro obnovení počítačů z data minulé inventury"
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr "Použít automatické akce pro kontrolu pravidel přiřazení entity"
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr "Použít automatickou akci pro kontrolu a poslání oznámení ohledně strojů které už neodpovídají pravidlům pro přiřazení entity a umístění"
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr "Automaticky zamykat"
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr "Odstranit počítače z OCSNG"
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr "Smazat počítače"
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Připojování k databázi"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Připojení k databázi se nezdařilo"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Neplatná verze OCSNG: vyžadována verze RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Neplatné nastavení OCSNG (je potřeba aktivovat TRACE_DELETED)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Úspěšné připojení k databázi"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Platná verze a nastavení OCSNG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Není možné přidat. Tento OCSNG server už existuje."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr "Není možné propojit tento počítač, sériové číslo se nachází na seznamu vyloučených (%d)"
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr "Není možné propojit tento počítač, neopakující se identifikátor je zařazen na seznamu vyloučených (%d)"
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Nelze importovat, počítač v GLPI je už spojen s položkou v OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Swap"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existující v GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existující v OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Žádná položka k vyčištění"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Žádný nový počítač k aktualizaci"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Počítače aktualizovány v OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synchronizovat"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Aktualizovat počítače"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Pozor! Importovaná data (viz nastavení) přepíšou ta stávající"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Režim ručního importu"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Vypnout náhled"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Zapnout náhled"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Nejprve zkontrolujte, zda jsou v OCSNG duplicity správně řízeny"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Import"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Stejné pravidlo?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Cílové umístění"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr "Sériové číslo nacházející se na seznamu vyloučených"
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr "Nikde se neopakující identifikátor (UUID) nacházející se na seznamu vyloučených"
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr "MAC adresa nacházející se na seznamu vyloučených"
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr "IP adresa nacházející se na seznamu vyloučených"
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr "Varování! Tento počítač už je propojen s jiným počítačem v OCS."
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Žádný nový počítač k importu"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "Software smazaný synchronizací s OCSNG"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr "Odstranit počítače z OCSNG"
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr "Smazat počítače"
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr "Spustit skript pro synchronizaci s OCSNG"
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr "Vyčistit staré agenty a zahodit je v OCSNG"
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr "Obnovit počítače z data minulé inventury"
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr "Vyčištění starých agentů se podařilo"
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr "Vyčištění starých agentů se nezdařilo"
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr "Mazání počítačů se podařilo"
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr "Mazání počítačů se nezdařil"
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr "Obnovení počítačů se podařilo"
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr "Obnovení počítačů se nezdařilo"
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr "Spustit ze serveru skript pro synchronizaci s OCSNG"
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Počítače nezkontrolované žádným pravidlem"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Duplicitní počítače"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Počítače, u kterých byl import odmítnut pravidlem"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr "SNMP objektů importováno"
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr "SNMP objektů synchronizováno"
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr "SNMP objektů připojeno"
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr "SNMP objektů neaktualizováno"
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr "SNMP objektů nenaimportováno"
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr "Objekty z IPDiscover importovány"
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr "Objekty z IPDiscover synchronizovány"
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr "Objekty z IPDiscover neaktualizovány"
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr "Objekty z IPDiscover nenaimporotovány"
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr "Statistiky importu SNMP z OCSNG"
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr "Statistiky IPDiscover importu z OCSNG"
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Statistiky OCSNG odkazu"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr "Verze sestavení"
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr "Datum instalace"
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr "Znaková sada"
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr "Kód země"
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr "Jazyk operačního systému"
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr "Stávající časová zóna"
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr "Místní a jazyková nastavení"
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Povolený OCSNG server"
@@ -1496,31 +1513,31 @@ msgstr[1] "Povolené OCSNG servery"
msgstr[2] "Povolených OCSNG serverů"
msgstr[3] "Povolené OCSNG servery"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Ruční synchronizace"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Viz informace"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr "Importovat počítač"
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr "Připojit počítač"
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr "URL adresa automatického nastavení"
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr "Výjimky proxy"
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1529,11 +1546,11 @@ msgstr[1] "%d klíče registru nalezeny"
msgstr[2] "%d klíčů registru nalezeno"
msgstr[3] "%d klíče registru nalezeny"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Soubor s registrem (hive)"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Žádný klíč nebyl v registru nalezen"
@@ -1548,47 +1565,47 @@ msgstr "Upozorňovat na počítače které už neodpovídají pravidlům pro př
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr "Položky které nesplňují pravidla přiřazení pro entitu %s: %s"
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr "Identifikátor procesu"
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr "Paměť procesu"
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr "Příkazový řádek"
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr "Společnost"
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr "Úplný název"
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr "Stav služby"
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr "Typ spuštění"
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr "Popis přístupového umístění"
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr "Sezení"
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr "Návratový kód"
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr "Spec návrat. kód"
@@ -1785,93 +1802,97 @@ msgid "See Setup : SNMP Import before"
msgstr "Viz nastavení: SNMP import před"
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr "Importovat nová SNMP zařízení"
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr "Informace o náplních"
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr "Informace o zásobnících papíru"
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr "Paměť tiskárny"
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr "Paměť počítače"
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr "Filtrovat seznam SNMP objektů"
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr "Dle typu položky"
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr "Dle IP adresy"
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr "Importovat nová SNMP zařízení do GLPI"
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr "Kontakt ze SNMP"
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr "Umístění ze SNMP"
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr "Typ ze SNMP"
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr "Typ položky kterou vytvořit"
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr "Žádné nové SNMP zařízení k importu"
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr "Žádné nové SNMP zařízení k aktualizaci"
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr "SNMP zařízení aktualizovaná v OCSNG"
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr "GLPI objekt"
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr "OCS SNMP zařízení"
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr "Aktualizovat SNMP zařízení"
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "Software smazaný synchronizací s OCSNG"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr "Teamviwer přístup"
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr "Teamviewer identifikátor"
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr "Teamviewer přímý přístup"
@@ -1936,54 +1957,54 @@ msgstr "Vyčistit procesy"
msgid "Delete processes after"
msgstr "Smazat procesy"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr "Aktualizace Windows"
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr "Předvolby aut. aktualizací"
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr "Naplánovat datum instalace"
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr "Okamžik posledního úspěchu"
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr "Zjistit okamžik úspěchu"
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr "Stáhnout si okamžik úspěchu"
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr "Je třeba automatických aktualizací a uživatelé si je mohou nastavit"
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr "Automaticky stáhnout a naplánovat instalaci"
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr "Automaticky stáhnout a upozornit na instalaci"
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "Upozornit před stažením"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr "Vypnout automatické aktualizace"
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Vypnuto"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr "Identifikátor zabezpečení (SID)"
diff --git a/locales/da_DK.mo b/locales/da_DK.mo
index 087e8c82..e25c3cd0 100644
Binary files a/locales/da_DK.mo and b/locales/da_DK.mo differ
diff --git a/locales/da_DK.po b/locales/da_DK.po
index 0ca9423b..84ff5788 100644
--- a/locales/da_DK.po
+++ b/locales/da_DK.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Danish (Denmark) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/da_DK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,210 +19,214 @@ msgstr ""
"Language: da_DK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Computere der ikke blev importeret af automatiske handlinger"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Genstart import"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importer til entiteten"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Slet computer i OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Gennemtving synkronisering OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Lås felter"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Lås felter op"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Opdater netværksport typer"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "GLPI import dato"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Sidste inventeringsdato i OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Opdater automatisk OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Inventeringsagent"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Sidste OCSNG forbindelsesdato"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP kilde"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr "Oppetid"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registreringsdatabase"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Nøgle/værdi"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG navn"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] "OCSNG server"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr "Proxy aktiveret"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "Proxyadresse"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr "Navn på service"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr "Processnavn"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr "SNMP import"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "OCSNG link"
msgstr[1] "OCSNG links"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Link muligt"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Import afvist"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Ny computer oprettet i GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Link med computer"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Låst felt"
msgstr[1] "Låste felter"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr "Du bruger ikke låse - Se opsætningen for at aktivere dem"
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr "Startdato feltet er låst af ocsinventoryng, lås det venligst op før opdatering."
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Konfiguration af automatisk synkronisering"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Aktiver venligst udvidelsen"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "Pc slettet"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Ingen nye computere at slette"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Ryd OCSNG slettede computere"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Computere der er importeret af automatiske handlinger"
@@ -233,14 +237,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] "Ukendt importeret netværksporttype"
msgstr[1] "Ukendte importerede netværksporttyper"
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Ryd links mellem GLPI og OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Ingen import: Dette plugin vil ikke importere disse emner"
@@ -248,7 +252,7 @@ msgstr "Ingen import: Dette plugin vil ikke importere disse emner"
msgid "Successful link"
msgstr "Link lykkedes"
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr "Ingen synkronisering: udvidelsen vil ikke synkronisere disse elementer"
@@ -260,7 +264,7 @@ msgstr "Information om scriptet"
msgid "Processes execution of automatic actions"
msgstr "Behandler udførelse af automatiske handlinger"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Tjek OCSNG importscriptet"
@@ -273,34 +277,38 @@ msgid "Authorize the OCSNG update"
msgstr "Godkend OCSNG opdateringen"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Genopfrisk information for en process hver"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "sekund"
msgstr[1] "sekunder"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Lås ikke aktiveret"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Lås aktiveret"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Lås"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Lås op"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Alle servere"
@@ -355,21 +363,21 @@ msgstr "Tråd"
msgid "Rules checked"
msgstr "Regler tjekket"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Importerede computere"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Linkede computere"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Computere der ikke er opdateret"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Synkroniserede computere"
@@ -378,150 +386,154 @@ msgstr "Synkroniserede computere"
msgid "Computers not unique"
msgstr "Ej-unikke computere"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Swap"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr "IPDiscover import"
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Valg af OCSNG server"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Hvis du ikke ser din OCSNG server i denne boks, så tjek om din profil kan tilgå den!"
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr "Importer IPDiscover"
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr "Link IPDiscover"
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Alle subnet"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Kendte subnet"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Ukendte subnet"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr "Ikke inventeret"
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr "Inventeret"
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr "Identificeret"
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr "Importeret / linket"
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr "Tilpas subnet"
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Subnetnavn"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Vælg ID"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Kunne ikke tilføje, et objekt med samme MAC adresse findes allerede."
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr "Ingen nye IPDiscover enheder der skal importeres"
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr "Slet link"
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Importdato i GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr "Link"
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "Slet fra OCSNG"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "OCS type"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr "GLPI type"
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr "Emne der skal linkes"
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Konfiguration af OCSNG server"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importer nye computere"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synkronisér allerede importerede computere"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Link nye OCSNG computere til eksisterende GLPI computere"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Scriptudførelse af automatisk handlinger"
@@ -559,28 +571,28 @@ msgstr "Du skal konfigurere en OCSNG server"
msgid "Add a OCSNG server"
msgstr "Tilføj en OCSNG server"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "OCS TYPE"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS MIB TYPE"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Opret et emne til definering af denne type"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Opret en mapning"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "tom"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Ingen ukendt netværksport-type fra OCS !"
@@ -622,15 +634,15 @@ msgstr "Lav ukendte porte om der svarer til"
msgid "Create"
msgstr "Opret"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr "Netværksshares"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Sti"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr "Kvote"
@@ -648,15 +660,15 @@ msgstr "Elementer der ikke svarer til reglen"
msgid "Elements not match with the rule by automatic actions"
msgstr "Elementer der ikke svarer til reglen ved automatiske handlinger"
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr "Bekræftelse af tilknytningsregler for entiteter og lokationer"
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr "Ingen regler passer"
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr "Datafejl"
@@ -664,856 +676,861 @@ msgstr "Datafejl"
msgid "Verified rules"
msgstr "Verificerede regler"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Kan ikke ændre en entitet"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Unikheds-kriterie ikke verificeret"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Import afvist af regel"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Handlinger der skal foretages på computeren"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Afsendelse af ej-importerede computere til OCSNG alarm mislykkedes"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Ej-importerede computere alarm"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr "OCS Inventory NG import oplysninger"
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "OCSNG grænseflade"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Gennemtving synkronisering"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr "OCS Inventory NG SNMP import oplysninger"
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr "Importeret objekt"
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr "Linket objekt"
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr "Gennemtving SNMP synkronisering"
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr "Seneste OCSNG SNMP inventeringsdato"
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr "OCS Inventory NG IPDiscover import oplysninger"
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr "OCSNG endhedsid"
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr "Ingen computer fundet i OCSNG databasen"
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr "Checksum test"
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importeret fra OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Slettet i OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Linket til en OCSNG computer"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "OCSNG ID'et for computeren blev ændret fra %1$s til %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "OCSNG TAG'et for computeren blev ændret fra %1$s til %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr "Kunne ikke linke til denne computer, serienummeret er sortlistet (%d)"
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr "Kunne ikke linke til denne computer, UUID er sortlistet (%d)"
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Kan ikke importere, GLPI computeren er allerede relateret til et element i OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Computere tjekker ikke nogen regler"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Duplikerede computere"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Computer der ikke importeres på grund af en regel"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr "SNMP objekter importeret"
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr "SNMP objekter synkroniseret"
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr "SNMP objekter linket"
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr "SNMP objekter ikke opdateret"
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr "SNMP objekter ikke importeret"
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr "IPDISCOVER objekter importeret"
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr "IPDISCOVER objekter synkroniseret"
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr "IPDISCOVER objekter ikke opdateret"
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr "IPDISCOVER objekter ikke importeret"
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr "Statistik for OCSNG SNMP import"
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr "Statistik for OCSNG IPDISCOVER import"
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Statistik for OCSNG linket"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr "Data der skal importeres"
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Import muligheder"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr "Generel historik"
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "OCSNG konsol"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Ekspert synk tilstand"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Database i UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Konfiguration af OCSNG server %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr "Opsæt regelmotor"
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr "Opsæt regler for valg af entitet ved emneimport"
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr "Opsæt regler for valg-kriterie ved emnelink"
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr "Se opsætning : Data der skal importeres først"
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Den valgte server er ikke aktiv. Import og synkronisering er ikke tilgængelig"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Generelle informationer"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Advarsel : import enhed reglerne afhænger af markerede felter"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Afhænger af Bios import"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr "Brugeroplysninger"
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr "Afhænger af kontakt import"
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr "Efter version 7006 af OCS Inventory NG"
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr "Efter version 7009 af OCS Inventory NG && afhænger af bios import"
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr "Linkede objekter"
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Global import"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "emne import"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Enhedsimport via serienummer"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Importer kun enheds serienummer"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Global import: alt bliver importeret, men emnet er globalt håndteret (uden dubletter)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Enhedsimport: alt importeres som det er"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr "OCS Inventory NG udvidelser"
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr "Microsoft Office licenser"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr "Afhænger af software import og OfficePack udvidelse til (https://github.com/PluginsOCSInventory-NG/officepack) OCSNG skal være installeret"
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr "Antivirus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr "Sikkerhedsudvidelse til OCSNG (https://github.com/PluginsOCSInventory-NG/security) skal være installeret"
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr "Uptime udvidelse til OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) skal være installeret"
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr "Windows Update tilstand"
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr "Winupdate udvidelse til OCSNG (https://github.com/PluginsOCSInventory-NG/winupdate) skal være installeret"
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr "Teamviewer udvidelsen til OCSNG (https://github.com/PluginsOCSInventory-NG/teamviewer) skal være installeret"
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr "Proxyindstillinger"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr "Navigator Proxy Setting udvidelsen til OCSNG (https://github.com/PluginsOCSInventory-NG/navigatorproxysetting) skal være installeret"
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr "Windows brugere"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr "Winusers udvidelsen til OCSNG (https://github.com/PluginsOCSInventory-NG/winusers) skal være installeret"
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr "OS oplysninger"
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr "OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/osinstall) skal være installeret"
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr "Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/networkshare) skal være installeret"
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr "Service"
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr "Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/services) skal være installeret"
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr "Kørende process"
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr "Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/runningProcess) skal være installeret"
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG Administrativ information"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr "Lav historik"
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr "Systemhistorik"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr "Bios historik"
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr "Enhedshistorik"
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr "Volumner-historik"
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr "Netværkshistorik"
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr "Skærmtilslutningshistorik"
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr "Printertilslutningshistorik"
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr "Tilbehørstilslutningshistorik"
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr "Software tilknytningshistorik"
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr "Virtuelle maskiner historik"
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr "Administrativ info historik"
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Web-adresse for OCSNG konsollen"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Begræns importen til de følgende tags ( seperator $, intet for alle )"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Ekskludér følgende tags (separator $, ingenting for alle)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Standard status"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Opførsel ved afbrydelse"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr "Behold link"
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr "Put linket i dustbin og tilføj en lås"
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr "Slet linket permanent"
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr "Angiv den handling der skal foretages på links til andre objekter når computer afbrydes fra dem"
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Brug OCSNG software bibliotek"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr "Hvis \"Brug OCSNG software ordbog\" parameteren er markeret vil ingen software blive importeret før du sætter det på o OCS"
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Antal emner der skal synkroniseres ved brug af den automatisk OCSNG handling"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr "Den automatiske opgave ocsng startes kun hvis serveren ikke er i eksperttilstand"
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr "Den automatiske hændelse ocsng synkroniserer eksisterende computere, den importerer ikke nye computere "
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr "Hvis du vil importere nye computere, skal du deaktivere denne parameter, skifte til eksperttilstand og bruge script fra system"
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Opførsel ved sletning af en computer i OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Skift til tilstand %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Database"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standard (tillad manuelle handlinger)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Ekspert (helt automatisk, for store konfigurationer)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Forbindelsestype"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr "Indlæs checksum igen"
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Vært"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "F.eks http://127.0.0.1 for SOAP metode"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Synkroniserings metode"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr "Brug automatisk handling for at fjerne gamle agenter & drop fra OCSNG software"
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr "Brug automatisk handling gendan slettet computer"
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr "Antal dage for gendannelse af computere fra sidste inventeringsdato"
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr "Brug automatisk handling til at kontrollere entitets-tilknytningsregler"
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr "Brug automatisk handling til at tjekke og sende en besked om maskiner der ikke længere svarer til entitet- og lokations tilknytnings regler"
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr "Brug automatiske låse"
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr "Ryd computere i OCSNG"
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr "Slet computere"
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Forbinder til databasen"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Forbindelse til databasen mislykkedes"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Ugyldig OCSNG version: RC3 er påkrævet"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Ugyldig OCSNG konfiguration (TRACE_DELETED skal være aktiv)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Forbindelse til databasen lykkedes"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Korrekt OCSNG konfiguration og version"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Kan ikke tilføje. OCSNG serveren eksisterer allerede."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr "Kunne ikke linke til denne computer, serienummeret er sortlistet (%d)"
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr "Kunne ikke linke til denne computer, UUID er sortlistet (%d)"
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Kan ikke importere, GLPI computeren er allerede relateret til et element i OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Swap"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Eksisterer i GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Eksisterer i OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Ingen emner der skal ryddes"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Ingen nye computere skal opdateres"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computere opdateret i OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synkroniser"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Opdater computere"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Forsigtig! De importerede data (se din konfiguration) vil overskrive de eksisterende"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Manuel import-tilstand"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Deaktiver forhåndsvisning"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Aktiver forvisning"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Kontrollér først om dubletter er håndteret korrekt i OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Import"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Pas til reglen ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Mål placering"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr "Sortlistet serienummer"
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr "Sortlistet UUID"
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr "Sortlistet MAC"
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr "Sortlistet IP"
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr "Advarsel! Denne computer er allerede forbundet med en anden OCS computer."
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Ingen nye computere skal importeres"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "Software slettet af OCSNG synkronisering"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr "Ryd computere i OCSNG"
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr "Slet computere"
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr "Start OCSNG synkroniseringsscript"
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr "Fjern gamle agenter & drop fra OCSNG software"
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr "Gendan computere fra sidste inventeringsdag"
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr "Fjernelse af gamle agenter OK"
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr "Fjernelse af gamle agenter mislykkedes"
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr "Slet computere OK"
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr "Slet computere mislykkedes"
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr "Gendan computere OK"
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr "Gendan computere mislykkedes"
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr "Start OCSNG synkroniseringsscript fra server"
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Computere tjekker ikke nogen regler"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Duplikerede computere"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Computer der ikke importeres på grund af en regel"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr "SNMP objekter importeret"
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr "SNMP objekter synkroniseret"
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr "SNMP objekter linket"
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr "SNMP objekter ikke opdateret"
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr "SNMP objekter ikke importeret"
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr "IPDISCOVER objekter importeret"
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr "IPDISCOVER objekter synkroniseret"
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr "IPDISCOVER objekter ikke opdateret"
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr "IPDISCOVER objekter ikke importeret"
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr "Statistik for OCSNG SNMP import"
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr "Statistik for OCSNG IPDISCOVER import"
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Statistik for OCSNG linket"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr "Build version"
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr "Installationsdato"
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr "Codeset"
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr "Landekode"
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr "OS sprog"
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr "Nuværende tidszone"
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr "Sprog"
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Tilladt OCSNG server"
msgstr[1] "Tilladte OCSNG servere"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Manuel synkronisering"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Se information"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr "Importer computer"
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr "Forbind computer"
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr "Auto Config URL"
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr "Proxy undtagelser"
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d registreringsnøgle fundet"
msgstr[1] "%d registreringsnøgler fundet"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Hive"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Ingen nøgle fundet i registreringsdatabasen"
@@ -1528,47 +1545,47 @@ msgstr "Beskeder ved computere der ikke længere svarer til reglerne for tilknyt
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr "Emner der ikke lever op til allokeringsreglerne for entiteten %s: %s"
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr "Process ID"
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr "Process hukommelse"
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr "Kommandolinje"
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr "Firma"
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr "Fulde navn"
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr "Service status"
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr "Starttype"
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr "Tilgangssti"
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr "Session"
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr "Exit kode"
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr "Spec exit kode"
@@ -1765,93 +1782,97 @@ msgid "See Setup : SNMP Import before"
msgstr "Se opsætning : SNMP import først"
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr "Importer nye SNMP enheder"
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr "Patronoplysninger"
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr "Bakkeoplysninger"
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr "Printerhukommelse"
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr "Computerhukommelse"
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr "Filter SNMP objekt liste"
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr "Efter emnetype"
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr "Efter IP"
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr "Importer nye SNMP enheder til glpi"
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr "Kontakt SNMP"
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr "Placering SNMP"
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr "SNMP type"
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr "Emnetype der skal oprettes"
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr "Ingen nye SNMP enheder kan importeres"
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr "Ingen nye SNMP enheder kan opdateres"
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr "SNMP enhed opdateret i OCSNG"
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr "GLPI objekt"
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr "OCS SNMP enhed"
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr "Opdater SNMP enhed"
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "Software slettet af OCSNG synkronisering"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr "Teamviewer adgang"
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr "Teamviewer ID"
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr "Teamviewer direct access"
@@ -1916,54 +1937,54 @@ msgstr "Ryd processer"
msgid "Delete processes after"
msgstr "Slet processer efter"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr "Windows opdateringer"
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr "AU indstillinger"
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr "Planlæg installationsdato"
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr "Sidste succestid"
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr "Opdag succestid"
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr "Download succestid"
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr "Automatiske opdateringer er påkrævet og brugere kan indstille det"
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr "Download og planlæg installation automatisk"
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr "Download automatisk og giv besked om installation"
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "Besked før download"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr "Deaktivere AU"
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Deaktiveret"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr "SID"
diff --git a/locales/de_DE.mo b/locales/de_DE.mo
index cad48e09..cbe4c7c2 100644
Binary files a/locales/de_DE.mo and b/locales/de_DE.mo differ
diff --git a/locales/de_DE.po b/locales/de_DE.po
index f32c2459..d470df29 100644
--- a/locales/de_DE.po
+++ b/locales/de_DE.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: German (Germany) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/de_DE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,210 +22,214 @@ msgstr ""
"Language: de_DE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Letzte Inventarisierung durch OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registrierung"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Schlüssel/Wert"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG Name"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -236,14 +240,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Verknüpfungen zwischen GLPI und OCSNG säubern"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Kein Import: Das Plugin wird diese Elemente nicht importieren."
@@ -251,7 +255,7 @@ msgstr "Kein Import: Das Plugin wird diese Elemente nicht importieren."
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -263,7 +267,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -276,34 +280,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -358,21 +366,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -381,150 +389,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "OCSNG Server wählen"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Daten nach GLPI importieren"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Neue Computer importieren"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synchronisierung der bereits importierten Computer"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -562,28 +574,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -625,15 +637,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -651,15 +663,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -667,856 +679,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "In OCSNG gelöscht"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Verknüpft mit OCSNG-Computer"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Doppelte Computer"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Computer dessen Import von einer Regel verweigert wurde"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Import Optionen"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Allgemeine Computerinformationen"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Gruppierter Import"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Import der Einzeleinträge (keine Gruppierung)"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Einzelimport auf Grundlage der Seriennummer"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Import der Einzeleinträge: nur Seriennummer"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG administrative Information"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL der OCSNG-Konsole"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Nur Einträge mit folgenden Tags importieren (Bei Angabe mehrerer Tags trennen mit $, leer für ALLE)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Schließen Sie die folgenden Tags aus (Trennzeichen $, nichts für alle)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Standard Status"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Das 'Software Dictionary' von OCSNG verwenden"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Anzahl Rechner, die via den automatischen Job ocsng synchronisiert werden sollen"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Verhalten bei Löschen eines Computers in OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Übergang zu Status %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Falsche Version von OCSNG: RC3 wird benötigt"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Ungültige OCSNG-Konfiguration (TRACE_DELETED muss aktiviert sein)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Version und Konfiguration von OCSNG ok"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Kann nicht hinzufügen. Der OCSNG-Server existiert bereits."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existiert in GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existiert in OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Kein zu säuberndes Objekt"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Kein Rechner muss aktualisiert werden."
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computer wurden in OCSNG aktualisiert"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synchronisieren"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Computer aktualisieren"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Manueller Import"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Vorschau aktivieren"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Bitte prüfen Sie, ob OCSNG konfiguriert ist, die Duplikate zu korrigieren"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importieren"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Trifft die Regel zu?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Zielort"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Kein neuer Rechner muss importiert werden"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Doppelte Computer"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Computer dessen Import von einer Regel verweigert wurde"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Kein Schlüssel in der Registrierung gefunden"
@@ -1531,47 +1548,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1768,93 +1785,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1919,54 +1940,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/el_GR.mo b/locales/el_GR.mo
index c807e5fa..14216dd1 100644
Binary files a/locales/el_GR.mo and b/locales/el_GR.mo differ
diff --git a/locales/el_GR.po b/locales/el_GR.po
index 299ebec8..61aa336a 100644
--- a/locales/el_GR.po
+++ b/locales/el_GR.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Greek (Greece) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/el_GR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,210 +17,214 @@ msgstr ""
"Language: el_GR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Τελευταία ημερομηνία OCSNG απογραφής"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Μητρώο"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Κλειδί/τιμή"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Ονομασία OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -231,14 +235,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Καθάρισμα συνδέσμων μεταξύ GLPI και OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Όχι εισαγωγή: το plugin δεν θα εισάγει αυτά τα στοιχεία"
@@ -246,7 +250,7 @@ msgstr "Όχι εισαγωγή: το plugin δεν θα εισάγει αυτά
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -258,7 +262,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -271,34 +275,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -353,21 +361,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -376,150 +384,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Επιλογή διακομιστή OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Εισαγωγή ημερομηνίας στο GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Εισαγωγή νέων υπολογιστών"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Συγχρονισμός υπολογιστών που έχουν εισαχθεί ήδη"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -557,28 +569,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -620,15 +632,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -646,15 +658,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -662,856 +674,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Διαγράφτηκε στο OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Συνδεδεμένο με έναν OCSNG υπολογιστή"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Διπλότυποι υπολογιστές"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Υπολογιστές που η εισαγωγή τους απορρίφθηκε από κανόνα"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Επιλογές εισαγωγής"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Γενικές Πληροφορίες"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Οικουμενική εισαγωγή"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Εισαγωγή μονάδας"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Εισαγωγή μονάδας σε αριθμό σειράς"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCS Διαχειριστικές πληροφορίες"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL της OCSNG κονσόλας"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Να εισαχθούν μόνο τα παρακάτω (διαχωριστή $, τίποτα για όλα)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Εξαίρεσε τις ακόλουθες ετικέτες(διαχωριστής $, τίποτα για όλα)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Προεπιλεγμένη Κατάσταση"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Χρησιμοποιήσε το λεξικό λογισμικού του OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Αριθμός αντικειμένων για συγχρονισμό χρησιμοποιώντας την αυτόματη ενέργεια του OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Αλλαγή σε κατάσταση %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Λάθος OCSNG έκδοση: χρειάζεται το RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Επικυρωμένες OCSNG ρυθμίσεις και έκδοση"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Υπάρχει στο GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Υπάρχει στο OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Δεν υπάρχει αντικείμενο για καθαρισμό"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Δεν υπάρχουν νέοι υπολογιστές για ενημέρωση"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Οι υπολογιστές ενημερώθηκαν στο OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Συγχρόνισε"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Ενημέρωση Υπολογιστών"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Χειροκίνητη εισαγωγή"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Ενεργοποίησε τη προεπισκόπιση"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Πρώτα, ελέγξτε εάν η διπλοεγγραφές διαχειρίζονται σωστά στο OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Εισαγωγή"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Κανόνας ταιριάσματος;"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Τοποθεσία στόχου"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Δεν υπάρχουν νέοι υπολογιστές για εισαγωγή"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Διπλότυποι υπολογιστές"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Υπολογιστές που η εισαγωγή τους απορρίφθηκε από κανόνα"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Δεν Βρέθηκε καταχωρημένο κλειδί"
@@ -1526,47 +1543,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1763,93 +1780,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1914,54 +1935,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/en_GB.mo b/locales/en_GB.mo
index b39eff65..21556b87 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 7c787887..222bac80 100644
--- a/locales/en_GB.po
+++ b/locales/en_GB.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the GLPI - Ocsinventoryng plugin package.
#
# Translators:
+# Amandine Manceau, 2018
# Erich Iseli , 2012
msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +19,214 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
-msgstr ""
+msgstr "Computers not imported by automatic actions"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
-msgstr ""
+msgstr "Restart import"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
-msgstr ""
+msgstr "Import in the entity"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
+msgstr "Delete computer in OCSNG"
+
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1563
+msgid "Force full import"
msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
-msgstr ""
+msgstr "Lock fields"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
-msgstr ""
+msgstr "Unlock fields"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
-msgstr ""
-
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+msgstr "Update networkport types"
+
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
-msgstr ""
+msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
-msgstr ""
+msgstr "GLPI import date"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
-msgstr ""
+msgstr "Last OCSNG inventory date"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
-msgstr ""
+msgstr "Automatic update OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
-msgstr ""
+msgstr "Inventory agent"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
-msgstr ""
+msgstr "OCSNG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
-msgstr ""
+msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
-msgstr ""
+msgstr "Last OCSNG connection date"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
-msgstr ""
+msgstr "IP Source"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
-msgstr ""
+msgstr "Uptime"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
-msgstr ""
+msgstr "Registry"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
-msgstr ""
+msgstr "Key/Value"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
-msgstr ""
+msgstr "OCSNG name"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "OCSNG server"
+msgstr[1] "OCSNG servers"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
-msgstr ""
+msgstr "Proxy enabled"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
-msgstr ""
+msgstr "Proxy address"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
-msgstr ""
+msgstr "Name of the service"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
-msgstr ""
+msgstr "Process name"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
-msgstr ""
+msgstr "SNMP Import"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -232,14 +237,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -247,7 +252,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -259,7 +264,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -272,34 +277,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -354,21 +363,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -377,150 +386,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -558,28 +571,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -621,15 +634,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -647,15 +660,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -663,856 +676,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr ""
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr ""
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr ""
+
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1527,47 +1545,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,93 +1782,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1915,54 +1937,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/en_US.mo b/locales/en_US.mo
index 4399e0a6..31b8ce4d 100644
Binary files a/locales/en_US.mo and b/locales/en_US.mo differ
diff --git a/locales/en_US.po b/locales/en_US.po
index 6657d67b..516bd23d 100644
--- a/locales/en_US.po
+++ b/locales/en_US.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: English (United States) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/en_US/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +18,214 @@ msgstr ""
"Language: en_US\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -232,14 +236,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -247,7 +251,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -259,7 +263,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -272,34 +276,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -354,21 +362,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -377,150 +385,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -558,28 +570,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -621,15 +633,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -647,15 +659,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -663,856 +675,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr ""
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr ""
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1527,47 +1544,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,93 +1781,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1915,54 +1936,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/es_ES.mo b/locales/es_ES.mo
index 69b60781..f58877a5 100644
Binary files a/locales/es_ES.mo and b/locales/es_ES.mo differ
diff --git a/locales/es_ES.po b/locales/es_ES.po
index 38593421..42013b7a 100644
--- a/locales/es_ES.po
+++ b/locales/es_ES.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Spanish (Spain) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/es_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -25,210 +25,214 @@ msgstr ""
"Language: es_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Equipos no importados por acciones automáticas"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Reiniciar la importación"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importar en la entidad"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Suprimir equipo en OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Fuerza la sincronización OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Campos bloqueados"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Desbloquear campos"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Actualizar los tipos de puerto de red"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Fecha de importación en GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Fecha del último inventario OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Actualización automática OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agente de inventariado"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "TAG OCSNG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "ID OCSNG"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Fecha de la última conexión de OCSNG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP de origen"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registro"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Clave/Valor"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nombre OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "Servidor OCSNG"
msgstr[1] "Servidores OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Enlace OCSNG"
msgstr[1] "Enlaces OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Enlace posible"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Importación rechazada"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nuevo equipo creado en GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Enlace con el equipo"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Campo bloqueado"
msgstr[1] "Campos bloqueados"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Sincronización automática de la configuración"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Activa el plugin, por favor"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "Pc eliminada"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "No hay nuevos ordenadores para eliminar"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Limpiar los computadores borrados de OCSNG"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Equipos importados por acciones automáticas"
@@ -239,14 +243,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Limpiar enlaces entre GLPI y OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "No importar: el complemento no importará estos elementos"
@@ -254,7 +258,7 @@ msgstr "No importar: el complemento no importará estos elementos"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -266,7 +270,7 @@ msgstr "Información sobre el script"
msgid "Processes execution of automatic actions"
msgstr "Ejecución de procesos de acciones automáticas"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Compruebe el scrip de importación de OCSNG"
@@ -279,34 +283,38 @@ msgid "Authorize the OCSNG update"
msgstr "Autorizar la actualización OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Actualizar la información de un proceso cada"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "segundo"
msgstr[1] "segundos"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Bloqueo no activado"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Bloqueo activado"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Bloquear"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Desbloquear"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Todos los servidores"
@@ -361,21 +369,21 @@ msgstr "Hilo"
msgid "Rules checked"
msgstr "Reglas comprobadas"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Equipos importados"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Equipos enlazados"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Equipos no actualizados"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Equipos sincronizados"
@@ -384,150 +392,154 @@ msgstr "Equipos sincronizados"
msgid "Computers not unique"
msgstr "Equipos no únicos"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Memoria de intercambio"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Elija un servidor OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Fecha de importación a GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configuración del servidor OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importar nuevos equipos"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronizar equipos ya importados"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Enlazar nuevos equipos OCSNG a equipos existentes en GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Ejecución de scripts de acciones automáticas"
@@ -565,28 +577,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "TIPO OCS"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "TIPO MIB OCS"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Crear una entrada para definir este tipo"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Crear un mapa"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "vacío"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "¡Sin tipos de puertos de red desconocidos desde OCS!"
@@ -628,15 +640,15 @@ msgstr ""
msgid "Create"
msgstr "Crear"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Ruta"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -654,15 +666,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -670,856 +682,861 @@ msgstr ""
msgid "Verified rules"
msgstr "Reglas verificadas"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "No puede afectar a una entidad"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Criterios de unicidad no verificados"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Importación rechazada por una regla"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Acciones a realizar en el equipo"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Enviar alerta de no importación de equipos de OCSNG fallida"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Sin alertas de importación de computadores"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interfaz OCS NG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forzar la sincronización"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importado desde OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Eliminado en OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Enlazado con un equipo OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "El ID OCSNG del equipo cambió de %1$s a %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "El TAG OCSNG del equipo cambió de %1$s a %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "No se puede importar, el equipo de GLPI ya está relacionado con un elemento de OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Los equipos no concuerdan con ninguna regla"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Equipos duplicados"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Equipos cuya importación es rechazada por una regla"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Estadísticas del enlace OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opciones de importación"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Consola OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Modo de sincronización experto"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Base de datos en UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configuración del servidor OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "El servidor seleccionado no está activo. La importación y sincronización no están disponibles"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Información general"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Depende de la importación de la Bios"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importación global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importación unitaria"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Importación unitaria basada en el número de serie"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Importación unitaria sólo con el número de serie"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Importación global: se importa todo, pero el material se gestiona globalmente (sin duplicados)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Importación unitaria: se importa todo tal como es"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Información administrativa de OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Dirección web de la consola OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limitar la importación a las siguientes etiquetas (separador $, nada para todas)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Excluir las siguientes etiquetas (separador $, nada para todas)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Estado predeterminado"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportamiento cuando se desconecte"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Utilizar el diccionario de software de OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Número de elementos a sincronizar a través de acciones automáticas OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportamiento al suprimir un equipo en OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Cambiar al estado %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Base de datos"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Estándar (permitir acciones manuales)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Experto (totalmente automático, para una configuración grande)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Tipo de conexión"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Servidor"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Método de sincronización"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Conexión a la base de datos"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Fallo en la conexión a la base de datos"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versión de OCSNG incorrecta: se necesita RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Configuración OCSNG incorrecta (debe activar TRACE_DELETED)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Conexión correcta a la base de datos"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Versión y configuración OCSNG válidas"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "No se puede añadir. El servidor OCSNG ya existe."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "No se puede importar, el equipo de GLPI ya está relacionado con un elemento de OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Memoria de intercambio"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existe en GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existe en OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "No hay objetos a limpiar"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "No existen nuevos equipos para actualizar"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Equipos actualizados en OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronizar"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Actializar equipos"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "¡Atención! Los datos importados (ver la configuración) sobrescribirán a los existentes"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modo de importación manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Desactivar vista previa"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activar vista previa"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Asegúrese de haber gestionado correctamente los duplicados en OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importar"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "¿Concuerda con la regla?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Ubicación destino"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "No existen nuevos equipos para importar"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Los equipos no concuerdan con ninguna regla"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Equipos duplicados"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Equipos cuya importación es rechazada por una regla"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Estadísticas del enlace OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Servidor OCSNG permitido"
msgstr[1] "Servidores OCS permitidos"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Sincronización manual"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Ver información"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d clave del registro encontrada"
msgstr[1] "%d claves de registro encontradas"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Subárbol"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "No se ha encontrado ninguna clave en el registro"
@@ -1534,47 +1551,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1771,93 +1788,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1922,54 +1943,54 @@ msgstr "Limpiar procesados"
msgid "Delete processes after"
msgstr "Suprimir procesos después de"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/es_VE.mo b/locales/es_VE.mo
index 4ef36168..bbc59b46 100644
Binary files a/locales/es_VE.mo and b/locales/es_VE.mo differ
diff --git a/locales/es_VE.po b/locales/es_VE.po
index 53c49fc1..45b3c167 100644
--- a/locales/es_VE.po
+++ b/locales/es_VE.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Spanish (Venezuela) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/es_VE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,210 +17,214 @@ msgstr ""
"Language: es_VE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Fecha del último inventario OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registro de Windows"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Clave/valor"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "nombre OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -231,14 +235,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Limpiar enlace entre GLPI y OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "No importar: GLPI no importará estos elementos"
@@ -246,7 +250,7 @@ msgstr "No importar: GLPI no importará estos elementos"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -258,7 +262,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -271,34 +275,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -353,21 +361,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -376,150 +384,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Elección de un servidor OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Fecha de importación a GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importación de nuevas computadoras"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronización de computadoras ya importadas"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -557,28 +569,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -620,15 +632,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -646,15 +658,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -662,856 +674,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Borrado de OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Enlazado con una computadora OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opciones de importación"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Información general"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importación global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importación única"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Importación única basada en el número de serie"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Información administrativa de OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Dirección web de la cónsola de OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limitar la importación a los tags siguientes (separador $; nada, para todos)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Excluir las siguientes etiquetas (separador $, nada para todas)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Estado predeterminado"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Usar el diccionario de software de OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Número de elementos a sincronizar vía acción autmática OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versión de OCSNG inválida: se requiere RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Configuración y versión válida de OCSNG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "No hay nueva computadora a ser actualizada"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computadoras actualizadas de OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronizar"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Actualización de computadoras"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modo de importación manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activar la vista previa"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Asegúrese de haber gestionado correctamente los duplicados de OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importar"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "¿Cumple la regla?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "No hay computadora nueva a ser importada"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "No se ha encontrado ninguna clave del Registro de Windows"
@@ -1526,47 +1543,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1763,93 +1780,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1914,54 +1935,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/et_EE.mo b/locales/et_EE.mo
index bb110667..468ea558 100644
Binary files a/locales/et_EE.mo and b/locales/et_EE.mo differ
diff --git a/locales/et_EE.po b/locales/et_EE.po
index 45ced2fb..8da829d6 100644
--- a/locales/et_EE.po
+++ b/locales/et_EE.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Estonian (Estonia) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/et_EE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,210 +19,214 @@ msgstr ""
"Language: et_EE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Importimata arvutid"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Vabasta väljad"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Viimane GLPI värskendus"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Viimane OCSNG inventeerimine"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Automaatne uuendamine OCSNG andmebaasist"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Inventeerimise agent"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Register"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Võti/Väärtus"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG nimi"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "OCSNG server"
msgstr[1] "OCSNG serverid"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "OCSNG ühendus"
msgstr[1] "OCSNG ühendused"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Lukustatud väli"
msgstr[1] "Lukustatud väljad"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Automaatse uuendamise seadistus"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Automaatselt imporditud arvutid"
@@ -233,14 +237,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Kustuta seosed OCSNG ja GLPI vahel"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -248,7 +252,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -260,7 +264,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -273,34 +277,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "sekund"
msgstr[1] "sekundit"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Avatud"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Lukus"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Lukusta"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Vabasta"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -355,21 +363,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Imporditud arvuteid"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Seotud arvuteid"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Uuendamata arvuteid"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Uuendatud arvuteid"
@@ -378,150 +386,154 @@ msgstr "Uuendatud arvuteid"
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Vali OCSNG server"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "OCSNG ja GLPI uuendamine"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "OCSNG serveri seadistus"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Impordi uusi arvuteid"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Uuenda olemasolevaid arvuteid"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Seo GLPI-s olevaid arvuteid uute OCSNG arvutitega"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -559,28 +571,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -622,15 +634,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -648,15 +660,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -664,856 +676,861 @@ msgstr ""
msgid "Verified rules"
msgstr "Kontrolli reegleid"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "OCSNG veebiliides"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Uuenda kohe"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Korduvaid arvuteid"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "OCSNG töötluse tulemused"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Importimise seaded"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "OCSNG veebiliides"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Andmebaas on UTF8 kooditabelis"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "OCSNG serveri seadistus %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Üldinfo"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG haldusinfo"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "OSCNG veebiliidese aadress"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Vaikimisi olek"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "OCSNG ja GLPI seose kustutamisel"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "OCSNG kirje kustutamisel"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Määra olek %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Uuendamise viis"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Andmebaasi ühendus"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Ühendumine andmebaasiga ebaõnnestus"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Ühendumine andmebaasiga õnnestus"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "OCSNG andmebaasi version ja seadistus sobivad"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "GLPI olemas"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "OCSNG olemas"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Seoseid pole"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Uuendatavaid arvuteid pole"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "OCSNG imporditud arvutid"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Uuenda"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Nimi"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Hoiatus! Imporditud info kirjutab olemasoleva info üle. Kontrolli OCSNG seadistust."
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Käsitsi importimise režiim"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Luba eelvaade"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Kontrolli, et duplikaadid on õigesti lahendatud"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Impordi"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Sobiv reegel"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Asukoht"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Uusi arvuteid pole"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Korduvaid arvuteid"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "OCSNG töötluse tulemused"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Käsitsi uuendamine"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Info vaatamine"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1528,47 +1545,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1765,93 +1782,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1916,54 +1937,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/fa_IR.mo b/locales/fa_IR.mo
index e6f6cb24..cede6edf 100644
Binary files a/locales/fa_IR.mo and b/locales/fa_IR.mo differ
diff --git a/locales/fa_IR.po b/locales/fa_IR.po
index 9d60c145..fa6b9b9a 100644
--- a/locales/fa_IR.po
+++ b/locales/fa_IR.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Persian (Iran) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/fa_IR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,210 +17,214 @@ msgstr ""
"Language: fa_IR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -231,14 +235,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -246,7 +250,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -258,7 +262,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -271,34 +275,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -353,21 +361,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -376,150 +384,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -557,28 +569,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -620,15 +632,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -646,15 +658,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -662,856 +674,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "در OCSNG حذف شد"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "پیوند به یک رایانه OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "همزمان شدن"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "درون برد"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "مطابقت با قانون؟"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1526,47 +1543,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1763,93 +1780,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1914,54 +1935,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo
index 2468e60a..4dce6a09 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 e9ba3778..c6d6c202 100644
--- a/locales/fr_FR.po
+++ b/locales/fr_FR.po
@@ -13,15 +13,15 @@
# Sylvain Briallon , 2012
# Xavier CAILLAUD , 2012
# Walid Nouh, 2012
-# Xavier CAILLAUD , 2017
+# Xavier CAILLAUD , 2017-2018
# Xavier CAILLAUD , 2012-2017
msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:01+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:26+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: French (France) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/fr_FR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -29,210 +29,214 @@ msgstr ""
"Language: fr_FR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Ordinateurs non importés par la synchronisation automatique"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Relancer l'import"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importer dans l'entité"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Supprimer l'ordinateur d'OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Forcer la synchronisation OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr "Lancer la synchronisation"
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr "Forcer un import complet"
+
+#: hook.php:1566
msgid "Lock fields"
msgstr "Verrouiller les champs"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Déverrouiller les champs"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Mettre à jour les types de port réseaux"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Date d'import dans GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Date dernier inventaire OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Mise à jour OCSNG automatique"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agent d'inventaire"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "TAG OCSNG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "ID OCSNG"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Date de dernière connexion OCSNG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP Source"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr "Durée de fonctionnement"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Base de registre"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Clé/valeur"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nom OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "Serveur OCSNG"
msgstr[1] "Serveurs OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr "Proxy activé"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "Adresse du proxy"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr "Nom du service"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr "Nom du processus"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr "Import SNMP"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Lien OCSNG"
msgstr[1] "Liens OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Liaison possible"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Import refusé"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nouvel ordinateur créé dans GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Liaison avec un ordinateur"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Champ verrouillé"
msgstr[1] "Champs verrouillés"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr "Vous n'utilisez pas les verrous - Voir la configuration pour les activer"
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr "La date de mise en service est verrouillée par ocsinventoryng. Merci de déverrouiller le champ avant de le modifier."
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Configuration de la synchronisation automatique"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Merci d'activer le plugin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "Ordinateurs supprimés"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Pas de nouveaux ordinateurs à supprimer"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Nettoyage des ordinateurs OCSNG supprimés"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Ordinateurs importés par la synchronisation automatique"
@@ -243,14 +247,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] "Type de ports réseaux inconnu importé"
msgstr[1] "Types de ports réseaux inconnus importés"
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Nettoyage des liens GLPI / OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Pas d'import : GLPI n'importera pas ces éléments"
@@ -258,7 +262,7 @@ msgstr "Pas d'import : GLPI n'importera pas ces éléments"
msgid "Successful link"
msgstr "Lien créé avec succès"
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr "Pas de synchronisation : Le plugin ne synchronisera pas ces élèments"
@@ -270,7 +274,7 @@ msgstr "Informations sur le script"
msgid "Processes execution of automatic actions"
msgstr "Exécutions de la synchronisation automatique"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Contrôler le script d'import OCSNG"
@@ -283,34 +287,38 @@ msgid "Authorize the OCSNG update"
msgstr "Autoriser la mise à jour d'OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr "Enregistrer les ordinateurs importés"
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Rafraichir les information du processus chaque"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "seconde"
msgstr[1] "secondes"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Verrouillage non activé"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Verrouillage activé"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Verrouiller"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Déverrouiller"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Tous les serveurs"
@@ -365,21 +373,21 @@ msgstr "Thread"
msgid "Rules checked"
msgstr "Règles contrôlées"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Ordinateurs importés"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Ordinateurs liés"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Ordinateurs non mis à jour"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Ordinateurs synchronisés"
@@ -388,150 +396,154 @@ msgstr "Ordinateurs synchronisés"
msgid "Computers not unique"
msgstr "Ordinateurs non uniques"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Swap"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr "Import IPDiscover"
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Choix d'un serveur OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Si vous ne trouvez pas votre serveur OCSNG dans la liste, merci de vérifier si votre profil y a accès"
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr "Import IPDiscover"
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr "Lien IPDiscover"
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Tous les sous-réseaux"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Sous-réseaux connus"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Sous-réseaux inconnus"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr "Non inventorié"
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr "Inventorié"
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr "Identifié"
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr "Importé / Lié"
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr "Modification du sous-réseau"
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Nom du sous-réseau"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Choix de l'ID"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Impossible de l'ajouter. Un objet ayant la même MAC adresse existe."
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr "Pas de nouveaux objets IPDiscover à importer"
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr "Suppression du lien"
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Date d'import dans GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr "Lien"
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "Supprimer dans OCSNG"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "Type OCSNG"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr "Type GLPI"
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr "Objet à lier"
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configuration du serveur OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importation de nouveaux ordinateurs"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synchronisation des ordinateurs déjà importés"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Lier les nouveaux ordinateurs d'OCSNG avec ceux existants dans GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Exécution des scripts de la synchronisation automatique"
@@ -569,28 +581,28 @@ msgstr "Vous devez configurer un serveur OCSNG"
msgid "Add a OCSNG server"
msgstr "Ajouter un serveur OCSNG"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "OCS Type"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS Type MIB"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Créer une entrée pour définir ce type"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Créer une correspondance"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "vide"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Pas de type de port réseau inconnu provenant d'OCSNG"
@@ -632,15 +644,15 @@ msgstr "Transformer les ports inconnus qui correspondent"
msgid "Create"
msgstr "Créer"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr "Lecteurs réseaux"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Chemin"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr "Quota"
@@ -658,15 +670,15 @@ msgstr "Éléments qui ne correspondent pas à une règle"
msgid "Elements not match with the rule by automatic actions"
msgstr "Éléments qui ne correspondent pas à une règle par l'action automatique"
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr "Vérification des règles d'affectation des entités et des lieux"
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr "Aucune règle ne correspond"
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr "Donnée de l'erreur"
@@ -674,856 +686,861 @@ msgstr "Donnée de l'erreur"
msgid "Verified rules"
msgstr "Règles vérifiées"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Impossible d'affecté une entité"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Critères d'unicité non vérifiés"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Import refusé par une règle"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Actions à faire sur l'ordinateur"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Echec de l'envoi de l'alerte concernant les ordinateurs non importés d'OCSNG"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Alerte sur les ordinateurs non importés"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr "Le package PHP Curl n'est pas installé"
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr "Informations de l'import OCS Inventory NG"
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interface OCSNG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr "Lancer la synchronisation"
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forcer la synchronisation"
+msgid "Force full import"
+msgstr "Forcer un import complet"
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr "Informations de l'import SNMP OCS Inventory NG"
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr "Objet importé"
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr "Objet lié"
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr "Forcer la synchronisation SNMP"
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr "Derniere date d'inventaire SNMP OCSNG"
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr "Informations de l'import IPDiscover OCS Inventory NG"
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr "OCSNG DEVICE ID"
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr "Pas d'ordinateur trouvé dans la base de données OCSNG"
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr "Test Checksum"
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importé depuis OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Supprimé d'OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Lié avec un ordinateur d'OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "L'ID OCSNG de l'ordinateur a changé de %1$s à %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "La balise OCSNG de l'ordinateur a changé de %1$s à %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr "Déverrouiller le champ et importer la donnée depuis OCSNG"
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr "Impossible de lier cet ordinateur, le numéro de série est blacklisté (%d)"
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr "Impossible de lier cet ordinateur, l'UUID est blacklisté (%d)"
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Importation impossible, ordinateur de destination de GLPI déjà lié à un élément d'OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Ordinateurs ne vérifiant aucune règle"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Ordinateurs en doublon"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Ordinateurs dont l'import est refusé par une règle"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr "Objets SNMP importés"
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr "Objets SNMP synchronisés"
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr "Objets SNMP liés"
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr "Objets SNMP non mis à jour"
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr "Objets SNMP non importés"
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr "Objets IPDiscover importés"
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr "Objets IPDiscover synchronisés"
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr "Objets IPDiscover non mis à jour"
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr "Objets IPDiscover non importés"
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr "Statistiques de l'import OCSNG SNMP"
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr "Statistiques de l'import IPDiscover OCSNG"
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Statistiques concernant la liaison OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr "Données à importer"
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Options d'importation"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr "Historique général"
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Console OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Mode de synchronisation expert"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Base de données en UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configuration du serveur OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr "Configuration des moteurs de règles"
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr "Configuration des règles d'affectation d'un élément à une entité"
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr "Configuration des règles d'import et de liaison des ordinateurs"
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr "Voir la configuration : Données à importer avant"
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Le serveur sélectionné n'est pas actif. L'import et la synchronisation sont imposssibles"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informations générales"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Attention : les règles d'affectation d'un élément à une entité dépendent des champs sélectionnés"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Dépends de l'import du Bios"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr "Informations sur l'utilisateur"
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr "Affecter l'utilisateur à partir de l'usager"
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr "Dépend de l'import de l'usager"
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr "Affecter le lieu de l'utilisateur par défaut"
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr "Affecter le premier groupe de l'utilisateur par défaut"
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr "Disponible après la version 7006 d'OCS Inventory NG"
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr "Disponible après la version 7009 d'OCS Inventory NG && dépendant de l'import du Bios"
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr "Objets liés"
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Import global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Import unique"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Import unique sur numéro de série"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Import unique numéro de série uniquement"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Import global : tout est importé mais le matériel est géré de manière globale (sans doublons)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Import unique : tout est importé tel quel"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr "Plugins OCS Inventory NG"
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr "Licences Microsoft Office"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr "Dépend de l'importation des logiciels et du plugin OfficePack pour (https://github.com/PluginsOCSInventory-NG/officepack) OCSNG doit être installé"
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr "Antivirus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr "Le plugin Security pour OCSNG doit être installé (https://github.com/PluginsOCSInventory-NG/security) "
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr "Le plugin Uptime pour OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) doit être installé"
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr "Statut Windows Update"
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr "Le plugin Winupdate pour OCSNG (https://github.com/PluginsOCSInventory-NG/winupdate) doit être installé"
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr "Le plugin Teamviewer pour OCSNG (https://github.com/PluginsOCSInventory-NG/teamviewer) doit être installé"
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr "Paramètres du proxy"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr "Le plugin Navigator Proxy Setting pour OCSNG (https://github.com/PluginsOCSInventory-NG/navigatorproxysetting) doit être installé"
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr "Utilisateurs de Windows"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr "Le plugin Winusers pour OCSNG (https://github.com/PluginsOCSInventory-NG/winusers) doit être installé"
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr "Informations sur l'OS"
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr "Le plugin OSInstall pour OCSNG doit être installé (https://github.com/PluginsOCSInventory-NG/osinstall) "
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr "Le plugin Networkshare pour OCSNG doit être installé (https://github.com/PluginsOCSInventory-NG/networkshare) "
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr "Service"
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr "Le plugin Service pour OCSNG doit être installé (https://github.com/PluginsOCSInventory-NG/services)"
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr "Processus en cours"
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr "Le plugin Running Process pour OCSNG doit être installé (https://github.com/PluginsOCSInventory-NG/runningProcess)"
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informations administratives OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr "Historiser"
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr "Historique du système"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr "Historique bios"
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr "Historique des composants"
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr "Historique des volumes"
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr "Historique des informations réseaux"
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr "Historique des moniteurs associés"
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr "Historique des imprimantes associées"
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr "Historique des périphériques associés"
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr "Historique des logiciels associés"
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr "Historique des machines virtuelles"
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr "Historique des informations administratives"
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr "Historique des plugins"
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Chemin d'accès web de la console OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limiter l'importation aux balises suivantes (séparateur $, rien pour tous)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Exclure les balises suivantes (séparateur $, rien pour aucun)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Statut par défaut"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportement lors de la déconnexion"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr "Conserver le lien"
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr "Mettre le lien à la corbeille et ajouter un verrou"
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr "Supprimer définitivement le lien"
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr "Définissez l'action à effectuer sur le lien avec d'autres objets lorsque l'ordinateur est déconnecté"
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Utiliser le dictionnaire logiciel d'OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr "Si le paramètre -Utiliser le dictionnaire logiciel d'OCSNG- est activé, aucun logiciel ne sera importé avant de l'avoir configuré dans OCS"
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Nombre d'éléments à synchroniser via l'action automatique OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr "La tâche automatique est lancée uniquement si le serveur n'est pas en mode Expert"
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr "La tâche automatique synchronise uniquement les ordinateurs existants, il n'importe pas les nouveaux ordinateurs"
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr "Si vous voulez importer les nouveaux ordinateurs, désactivez ce paramètre, activez le mode expert et utilisez le script système"
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportement à la suppression d'un ordinateur dans OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Passage à l'état %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Base de données"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standard (Autorise les actions manuelles)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expert (Complètement automatisée, pour grands parcs)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Type de connexion"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr "Recharger le Checksum"
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Hôte"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "exemple http://127.0.0.1 pour la méthode SOAP"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Méthode de synchronisation"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr "Utiliser l'action automatique de nettoyage des agents & suppression depuis OCSNG"
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr "Utiliser l'action automatique de restauration des ordinateurs supprimés"
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr "Nombre de jours pour la restauration des ordinateurs suivant la date de dernier inventaire"
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr "Utiliser l'action automatique pour vérifier les règles d'affectation d'entité"
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr "Utiliser une action automatique pour vérifier et envoyer une notification pour les machines qui ne répondent plus aux règles d'affectation de l'entité et de lieux"
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr "Utiliser les verrous automatiques"
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr "Suppression des ordinateurs dans OCSNG"
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr "Mise en corbeille des ordinateurs"
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Connexion à la base de données"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Échec de connexion à la base de données"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Version d'OCSNG non valide : nécessite RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Configuration OCSNG invalide (TRACE_DELETED doit être activé)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Connexion à la base de données réussie"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Version et Configuration OCSNG valide"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Ajout impossible. Le serveur OCSNG existe déjà."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr "Impossible de lier cet ordinateur, le numéro de série est blacklisté (%d)"
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr "Impossible de lier cet ordinateur, l'UUID est blacklisté (%d)"
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Importation impossible, ordinateur de destination de GLPI déjà lié à un élément d'OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Swap"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Présent dans GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Présent dans OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Aucun objet à nettoyer."
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Pas de nouvel ordinateur à mettre à jour"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Ordinateurs mis à jour dans OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synchroniser"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Mise à jour des ordinateurs"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Attention ! Les données importées (voir votre configuration) écraseront les données existantes"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Mode d'import manuel"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Désactiver la prévisualisation"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activer la prévisualisation"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Assurez-vous au préalable d'avoir géré correctement les doublons dans OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importer"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Vérifie la règle ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Lieu de destination"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr "Numéro de série blacklisté"
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr "UUID blacklisté"
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr "MAC blacklisté"
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr "IP blacklisté"
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr "Attention! L'ordinateur est déjà lié avec un autre ordinateur OCS."
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Pas de nouvel ordinateur à importer"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "Logiciel supprimé par la synchronisation OCSNG"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr "Suppression des ordinateurs dans OCSNG"
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr "Mise en corbeille des ordinateurs"
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr "Lancement du script de synchronisation OCSNG"
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr "Nettoyage des agents & suppression depuis OCSNG"
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr "Restaurer les ordinateurs à partir de la date du dernier inventaire"
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr "Nettoyage des agents OK"
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr "Nettoyage des agents échoué"
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr "Suppression des ordinateurs OK"
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr "Suppression des ordinateurs échoués"
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr "Restauration des ordinateurs OK"
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr "Restauration des ordinateurs échoués"
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr "Lancement du script de synchronisation depuis le serveur"
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Ordinateurs ne vérifiant aucune règle"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Ordinateurs en doublon"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Ordinateurs dont l'import est refusé par une règle"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr "Objets SNMP importés"
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr "Objets SNMP synchronisés"
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr "Objets SNMP liés"
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr "Objets SNMP non mis à jour"
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr "Objets SNMP non importés"
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr "Objets IPDiscover importés"
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr "Objets IPDiscover synchronisés"
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr "Objets IPDiscover non mis à jour"
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr "Objets IPDiscover non importés"
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr "Statistiques de l'import OCSNG SNMP"
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr "Statistiques de l'import IPDiscover OCSNG"
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Statistiques concernant la liaison OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr "Version constructeur"
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr "Date d'installation"
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr "Codeset"
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr "Code pays"
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr "Langue OS"
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr "Fuseau horaire actuel"
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr "Locale"
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Serveur OCSNG autorisé"
msgstr[1] "Serveurs OCSNG autorisés"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Synchronisation manuelle"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Voir les informations OCSNG"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr "Importer les ordinateurs"
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr "Lier des ordinateurs"
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr "URL de configuration automatique"
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr "Exceptions de proxy"
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d clé de registre trouvée"
msgstr[1] "%d clés de registre trouvées"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Ruche"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Aucune clé de la base de registre trouvée"
@@ -1538,47 +1555,47 @@ msgstr "Ordinateurs qui ne répondent plus aux règles d'affectation d'un élém
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr "Éléments qui ne répondent pas aux règles d'affectation de l'entité %s: %s"
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr "ID du processus"
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr "Mémoire du processus"
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr "Ligne de commande"
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr "Société"
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr "Nom complet"
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr "Etat du service"
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr "Type de démarrage"
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr "Chemin d'accès"
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr "Session"
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr "Code de sortie"
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr "Code de sortie spec"
@@ -1775,93 +1792,97 @@ msgid "See Setup : SNMP Import before"
msgstr "Voir la configuration : Import SNMP avant"
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr "Import de nouveaux objets SNMP"
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr "Informations sur les cartouches"
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr "Informations sur les magasins"
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr "Mémoire de l'imprimante"
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr "Mémoire de l'ordinateur"
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr "Flitrer la liste des objets SNMP"
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr "Par type d'objet"
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr "Par IP"
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr "Import des nouveaux objets SNMP dans GLPI"
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr "Contact SNMP"
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr "Lieu SNMP"
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr "Type SNMP"
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr "Type d'objet à créer"
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr "Pas de nouvel objet SNMP à importer"
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr "Pas de nouvel objet SNMP à mettre à jour"
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr "Objet SNMP mis à jour dans OCSNG"
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr "Objet GLPI"
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr "Objet SNMP OCSNG"
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr "Mise à jour de l'objet SNMP"
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "Logiciel supprimé par la synchronisation OCSNG"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr "Accès Teamviewer"
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr "ID Teamviewer"
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr "Accès direct à Teamviewer"
@@ -1926,54 +1947,54 @@ msgstr "Nettoyer les processus"
msgid "Delete processes after"
msgstr "Supprimer les processus après"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr "Windows Updates"
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr "Options de mises à jours automatique"
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr "Date d'installation planifiée"
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr "Dernier date de succès"
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr "Dernière détection en succès"
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr "Dernier téléchargement en succès"
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr "Mises à jours automatiques requises et l'utilisateur peut les configurer"
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr "Téléchargement automatique et planification de l'installation"
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr "Téléchargement automatique et notification de l'installation"
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "Notifier avant le téléchargement"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr "Déactiver les mises à jour automatique"
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Désactivée"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr "SID"
diff --git a/locales/gl_ES.mo b/locales/gl_ES.mo
index 3f93f3ce..24316e75 100644
Binary files a/locales/gl_ES.mo and b/locales/gl_ES.mo differ
diff --git a/locales/gl_ES.po b/locales/gl_ES.po
index 7b9364cd..d05d9fc9 100644
--- a/locales/gl_ES.po
+++ b/locales/gl_ES.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Galician (Spain) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/gl_ES/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,210 +19,214 @@ msgstr ""
"Language: gl_ES\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Equipos non importados polas accións automáticas"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Reiniciar importación"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importar na entidade"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Eliminar equipo en OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Forzar sincronización co OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Desbloquear campos"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Data de importación no GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Data do último inventario OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Actualización automática OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Axente de inventario"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Rexistro de Windows"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Chave/valor"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nome OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] "Servidor OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Ligazón OCSNG"
msgstr[1] "Ligazóns OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Campo bloqueado"
msgstr[1] "Campos bloqueados"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Configuración da sincronización automática"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Por favor, activa o plugin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Equipos importados polas accións automáticas"
@@ -233,14 +237,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Limpeza de ligazóns GLPI-OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Non importar: GLPI non importará estes elementos"
@@ -248,7 +252,7 @@ msgstr "Non importar: GLPI non importará estes elementos"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -260,7 +264,7 @@ msgstr "Información do script"
msgid "Processes execution of automatic actions"
msgstr "Execución de procesos de accións automáticas"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Comproba o script de importación do OCSNG"
@@ -273,34 +277,38 @@ msgid "Authorize the OCSNG update"
msgstr "Permitir a actualización de OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Actualizar a información dun proceso cada "
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "segundo"
msgstr[1] "segundos"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Bloqueo non activado"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Bloqueo activado"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Bloqueo"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Desbloqueo"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Todos os servidores"
@@ -355,21 +363,21 @@ msgstr "Fío"
msgid "Rules checked"
msgstr "Comprobación de regras"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Equipos importados"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Equipos ligados"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Equipos non actualizados"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Equipos sincronizados"
@@ -378,150 +386,154 @@ msgstr "Equipos sincronizados"
msgid "Computers not unique"
msgstr "Equipos non únicos (duplicados?)"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Swap"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Elixa un servidor OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Data de importación a GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configuración do servidor OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importación de computadores novos"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronización de computadores xa importados"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Ligar novos equipos OCSNG cos existentes en GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Execución de scripts de accións automáticas"
@@ -559,28 +571,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -622,15 +634,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Ruta"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -648,15 +660,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -664,856 +676,861 @@ msgstr ""
msgid "Verified rules"
msgstr "Regras verificadas"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Non pode afectar á entidade"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Criterio de non duplicación non verificado"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Importación rexeitada por regra"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Accións a realizar no equipo"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Fallou a alerta para enviar computadores OCSNG non importados"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interface OCSNG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forzar sincronización"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importación dende OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Borrado de OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Ligado cun computador de OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "A ID OCSNG do computador mudou de %1$s a %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "O TAG OCSNG do computador mudou de %1$s a %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Non se pode importar, o computador GLPI xa está relacionado cun elemento do OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Os computadores non comproban ningunha regra"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Computadoras duplicadas"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Computadoras cuxa importación é rexeitada por unha regla"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Estatísticas da ligazón OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opcións de importación"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Consola OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Modo de sincronización experto"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Base de datos en UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configuración do servidor OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Información xeral"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importación global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importación única"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Dependencia de importación sobre o número de serie"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Dependencia de importación sobre o número de serie"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Importación global: impórtase todo pero o material é xestionado globalmente (sen duplicados)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Importanción desde a unidade: impórtase todo tal e como está"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Información administrativa de OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL da consola de OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limitar a importación ás tags seguintes (separador $; nada, para todos)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Excluir as seguintes etiquetas (separador $, nada para todas)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Estado predeterminado"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportamento durante a desconexión"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Utilizar o dicionario de software de OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Cantidade de elementos a sincronizar mediante tarefas programadas con OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportamento do borrado dunha computadora en OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Cambio de estado a %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Estándar (permitir accións manuais)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Experto (totalmente automático, para unha configuración ampla)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Método de sincronización"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Conectando coa base de datos"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Fallou a conexión coa base de datos"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versión de OCSNG non válida: necesítase RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Configuración OCSNG incorrecta (TRACE_DELETED debe estar activa)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "A conexión coa base de datos realizouse con éxito"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Versión e configuración OCSNG válidas"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Imposible engadir. O servidor OCSNG xa existe."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Non se pode importar, o computador GLPI xa está relacionado cun elemento do OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Swap"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existe en GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existe en OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Non hai obxectos a limpar"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Non hai novos computadores para actualizar"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computadores actualizados en OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronizar"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Actualización de computadores"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Coidado! Os datos importados (mira a túa configuración) substituirán os existentes"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modo de importación manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Desactivar vista previa"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activar a vista preliminar"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Asegúrese de ter xestionado correctamente os duplicados en OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importar"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Cumpre a regra?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Localización de destino"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Non hai novos computadores para importar"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Os computadores non comproban ningunha regra"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Computadoras duplicadas"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Computadoras cuxa importación é rexeitada por unha regla"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Estatísticas da ligazón OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Sincronización manual"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Ver información"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d claves de rexistro atopadas"
msgstr[1] "%d claves de rexistro atopadas"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Sección"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Non se atopou ningunha chave do Rexistro de Windows"
@@ -1528,47 +1545,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1765,93 +1782,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1916,54 +1937,54 @@ msgstr "Limpar procesos"
msgid "Delete processes after"
msgstr "Eliminar procesos ao rematar"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/glpi.pot b/locales/glpi.pot
index e347d7a7..dbab7f6a 100644
--- a/locales/glpi.pot
+++ b/locales/glpi.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GLPI - Ocsinventoryng plugin 1.3.3\n"
+"Project-Id-Version: GLPI - Ocsinventoryng plugin 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,210 +18,214 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84 inc/menu.class.php:104
-#: inc/ocsserver.class.php:570 inc/ocsserver.class.php:571
-#: inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86 inc/menu.class.php:104
+#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -232,14 +236,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -247,7 +251,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -259,7 +263,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -272,34 +276,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -354,21 +362,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -377,150 +385,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -558,28 +570,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -621,15 +633,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -647,15 +659,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -663,856 +675,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
msgctxt "button"
-msgid "Force synchronization"
+msgid "Launch synchronization"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
+msgctxt "button"
+msgid "Force full import"
+msgstr ""
+
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com/"
"PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com/"
"PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/"
"runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr ""
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr ""
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1527,47 +1544,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,93 +1781,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1915,54 +1936,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/he_IL.mo b/locales/he_IL.mo
index cdcbba39..90a1e669 100644
Binary files a/locales/he_IL.mo and b/locales/he_IL.mo differ
diff --git a/locales/he_IL.po b/locales/he_IL.po
index 2b284a76..1cf9c215 100644
--- a/locales/he_IL.po
+++ b/locales/he_IL.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Hebrew (Israel) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/he_IL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,117 +17,121 @@ msgstr ""
"Language: he_IL\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "תאריך אחרון של מצאי ב-OCS"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registry"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "מפתח/ערך"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "שם ב-OCS"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -136,29 +140,29 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
@@ -166,23 +170,23 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
@@ -190,43 +194,43 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -239,14 +243,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "להסיר קישורים בין GLPI ו-OCS"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "No import: the plugin will not import these elements"
@@ -254,7 +258,7 @@ msgstr "No import: the plugin will not import these elements"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -266,7 +270,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -279,10 +283,14 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
@@ -290,25 +298,25 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -365,21 +373,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -388,150 +396,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "בחר שרת OCS"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "תאריך ייבוא ל-GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "לייבא מחשבים חדשים"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "לסנכרן מחשבים שכבר ייבאו"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -569,28 +581,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -634,15 +646,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -660,15 +672,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -676,815 +688,820 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "נמחק ב-OCS"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "מקושר עם מחשב ב-OCS"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Import Options"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "General informations"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "יבוא גלובלי"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "יבוא כיחידה"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Unit import on serial number"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG Administrative Information"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Web address of the OCSNG console"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limit the import to the following tags (separator $, nothing for all)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Exclude the following tags (separator $, nothing for all)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Default status"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Use the OCSNG software dictionary"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Number of items to synchronize via the automatic OCSNG action"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "גרסה לא מתאימה של OCSNG: גרסה נדרשת RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "גירסה והגדרות מתאימות של OCSNG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "אין מחשבים חדשים לעדכן"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "מחשבים מעודכנים במערכת OCS"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "לסנכרן"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "לעדכן מחשבים"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "ייבוא במצב ידני"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "הפעל את התצוגה המקדימה"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "ייבוא"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "להתאים אל הכלל?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "אין מחשבים חדשים לייבא"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
@@ -1492,31 +1509,31 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1525,11 +1542,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "לא נמצא מפתח ב-REGISTRY"
@@ -1544,47 +1561,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1781,93 +1798,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1932,54 +1953,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/hr_HR.mo b/locales/hr_HR.mo
index 5dd94d36..b80a6dab 100644
Binary files a/locales/hr_HR.mo and b/locales/hr_HR.mo differ
diff --git a/locales/hr_HR.po b/locales/hr_HR.po
index 43373535..0d933186 100644
--- a/locales/hr_HR.po
+++ b/locales/hr_HR.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Croatian (Croatia) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/hr_HR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,117 +20,121 @@ msgstr ""
"Language: hr_HR\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Računala koja nisu uvezena automatizacijom"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Ponovi uvoz"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Uvezi u jedinicu"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Obriši računalo u OCSNG-u"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Prisilno usklađivanje s OCSNG-om"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Zaključaj polja"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Otključaj polja"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Ažuriraj tipove mrežnog priključka"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Datum GLPI uvoza"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Posljednji datum imovine OCSNG-a"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Automatska nadogradnja OCSNG-a"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agent za imovinu"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG oznaka"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Posljednji datum spajanja OCS NG-a"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "Izvor IP-a"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registar"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Ključ/Vrijednost"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG ime"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -138,95 +142,95 @@ msgstr[0] "OCSNG poslužitelj"
msgstr[1] "OCSNG poslužitelji"
msgstr[2] "OCSNG poslužitelji"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "OCSNG poveznica"
msgstr[1] "OCSNG poveznice"
msgstr[2] "OCSNG poveznice"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Veza je moguća"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Uvoz odbijen"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Novo računalo stvoreno u GLPI-u"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Poveži s računalom"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Zaključano polje"
msgstr[1] "Zaključana polja"
msgstr[2] "Zaključanih polja"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Postavke za automatsko usklađivanje"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Molim, aktivirajte dodatak"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "PC obrisan"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Nema novih računala za obrisati"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Počisti obrisana računala u OCS NG-u"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Računala uvezena automatizacijom"
@@ -238,14 +242,14 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Očisti veze između GLPI-a i OCSNG-a"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Nema uvoza: plugin neće uvesti ove elemente"
@@ -253,7 +257,7 @@ msgstr "Nema uvoza: plugin neće uvesti ove elemente"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -265,7 +269,7 @@ msgstr "Podaci o skripti"
msgid "Processes execution of automatic actions"
msgstr "Procesira izvršenje automatizacije"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Provjeri skriptu OCSNG-a za uvoz"
@@ -278,35 +282,39 @@ msgid "Authorize the OCSNG update"
msgstr "Dopusti nadogradnju OCSNG-a"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Osvježi informacije o procesu svakih"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "sekunda"
msgstr[1] "sekunde"
msgstr[2] "sekunda"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Zaključavanje nije aktivirano"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Zaključavanje aktivirano"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Zaključaj"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Otključaj"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Svi poslužitelji"
@@ -362,21 +370,21 @@ msgstr "Nit"
msgid "Rules checked"
msgstr "Pravila provjerena"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Uvežena računala"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Spojena računala"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Nenadograđena računala"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Usklađena računala"
@@ -385,150 +393,154 @@ msgstr "Usklađena računala"
msgid "Computers not unique"
msgstr "Duplicirana računala"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Zamijena"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Izbor OCSNG poslužitelja"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Ukoliko ne nađete vaš OCS NG poslužitelj na ovoj listi, provjerite može li mu vaš profil pristupiti !"
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Uvezi datum u GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Konfiguracija poslužitelja OCS NG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Uvezi nova računala"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Uskladi s već uvezenim računalima"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Poveži nova (OCSNG) u postojeća računala (GLPI)"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Automatski izvršene skripte"
@@ -566,28 +578,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "OCS TYPE"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS MIB TYPE"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Stvaranje unosa za definiranje ovog tipa"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Stvorite mapiranje"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "prazno"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Nema nepoznatih mrežnih vrsta priključaka iz OCS-a"
@@ -630,15 +642,15 @@ msgstr "Transformiraj nepoznate priključke koji odgovaraju"
msgid "Create"
msgstr "Stvorite"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Putanja"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -656,15 +668,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -672,846 +684,851 @@ msgstr ""
msgid "Verified rules"
msgstr "Provjerena pravila"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Utjecaj na jedinicu nije moguć"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Kriterij jedinstvenosti nije provjeren"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Uvoz odbijen pravilom"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Akcije za izvršiti na računalu"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Slanje upozorenja OCSNG-a \"Neuvežena računala\" nije uspjelo"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Nema upozorenja za uvezena računala"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "OCS NG Sučelje"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Prisili usklađivanje"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Uveženo iz OCSNG-a"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Izbrisano u OCSNG-u"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Povezan s računalom iz OCSNG-a"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "OCSNG ID računala je promijenjen s %1$s na %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "OCSNG oznaka računala je promijenjena iz %1$s na %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Nije moguć uvoz, GLPI računalo je već povezano sa elementom u OCSNG-u (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Računala ne provjerava niti jedno pravilo"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Dupliciran računala"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Računala čiji je uvoz odbijen pravilom"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Statistika OCSNG veze"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opcije uvoza"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "OCSNG konzola"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Mod expert sinkronizacije"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Baza podataka u UTF8 notaciji"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Konfiguracija poslužitelja OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Odabrani poslužitelj nije aktivan. Uvoz i sinkronizacija nisu dostupni"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Opće informacije"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Upozorenje: pravila uvoza jedinice ovise o odabranim poljima"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Ovisi o uvozu BIOS-a"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Globalni uvoz"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Uvoz stavki"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Uvoz stavki po serijskom broju"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Uvoz samo serijskog broja jedinice"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Globalni uvoz: sve je uveženo, ali materijalom se globalno upravlja (bez duplikata)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Uvoz stavki: sve uveženo jednako je izvoru"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG administrativni podaci"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Web adresa OCSNG konzole"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Ograniči uvoz na sljedeće oznake (za odvajanje $, ništa za sve)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Izostavi sljedeće oznake (za odvajanje $, ništa za sve)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Početno stanje"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Ponašanje prilikom isključenja"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Koristi OSCNG-ov rječnik softvera"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Broj stavaka za sinkronizaciju putem automatske OCSNG akcije"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Ponašanje na brisanje računala iz OSCNG-a"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Promjeni u stanje %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Baza podataka"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standardno (omogućuje ručne akcije)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expert (potpuno automatski, za velike konfiguracije)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Vrsta konekcije"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Domaćin"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "Kao http://127.0.0.1 za SOAP metodu"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Metoda sinkronizacije"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Spajanje na bazu podataka"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Spajanje na bazu podataka nije uspjelo"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Pogrešna verzija OCSNG-a: RC3 je uvjetovana"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Neispravna OCSNG postavka (TRACE_DELETED mora biti aktivna)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Spajanje na bazu podataka je uspjelo"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Valjane OCSNG postavke i verzija"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Nije moguće dodavanje. OCSNG poslužitelj već postoji."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Nije moguć uvoz, GLPI računalo je već povezano sa elementom u OCSNG-u (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Zamijena"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Postojeće u GLPI-u"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Postojeće u GLPI-u"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Nema stavke za čišćenje"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Nema novih računala koja treba ažurirati"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Računala ažurirana u OCSNG-u"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Uskladi"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Ažuriraj računala"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Oprez! Uvezeni podaci (vidi postavke) će prepisati postojeće"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Ručni način uvoza"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Deaktiviraj pregled"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Aktiviraj pregled"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Najprije provjerite da se upravljanje sa duplikatima ispravno obavlja u OCSNG-u"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Uvezi"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Primjeni pravilo ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Ciljana lokacija"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Nema novih računala koja treba uvesti"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Računala ne provjerava niti jedno pravilo"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Dupliciran računala"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Računala čiji je uvoz odbijen pravilom"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Statistika OCSNG veze"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Dopušten poslužitelj OCS NG-a"
msgstr[1] "Dopuštena poslužitelja OCS NG-a"
msgstr[2] "Dopuštenih poslužitelja OCS NG-a"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Ručna sinkronizacija"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Pogledaj informacije"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1519,11 +1536,11 @@ msgstr[0] "%d pronađen ključ u registry-u"
msgstr[1] "%d pronađeno ključeva u registry-u"
msgstr[2] "%d ključeva pronađeno u registru"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Hive"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Ključ nije nađen u registry-u"
@@ -1538,47 +1555,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1775,93 +1792,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1926,54 +1947,54 @@ msgstr "Ukloni obrade"
msgid "Delete processes after"
msgstr "Obriši procese nakon"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/hu_HU.mo b/locales/hu_HU.mo
index c2fbe9ce..c25e3e17 100644
Binary files a/locales/hu_HU.mo and b/locales/hu_HU.mo differ
diff --git a/locales/hu_HU.po b/locales/hu_HU.po
index b9a39d24..2a493060 100644
--- a/locales/hu_HU.po
+++ b/locales/hu_HU.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Hungarian (Hungary) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/hu_HU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,210 +17,214 @@ msgstr ""
"Language: hu_HU\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -231,14 +235,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -246,7 +250,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -258,7 +262,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -271,34 +275,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -353,21 +361,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -376,150 +384,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -557,28 +569,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -620,15 +632,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -646,15 +658,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -662,856 +674,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "OCS-ban törölve"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Egy OCS géphez kapcsolva"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Szinkronizál"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importál"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Illeszkedik a szabály ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1526,47 +1543,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1763,93 +1780,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1914,54 +1935,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/it_IT.mo b/locales/it_IT.mo
index 6a4de2d4..efce3823 100644
Binary files a/locales/it_IT.mo and b/locales/it_IT.mo differ
diff --git a/locales/it_IT.po b/locales/it_IT.po
index cfa4b573..2cde7e14 100644
--- a/locales/it_IT.po
+++ b/locales/it_IT.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Italian (Italy) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/it_IT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,210 +23,214 @@ msgstr ""
"Language: it_IT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Computer non importata dalle azioni automatiche"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Riavvia l'importazione"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importa nell'entità"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Elimina computer in OCS-NG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Forza sincronizzazione con OCS-NG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Blocca i campi"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Sblocca i campi"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Aggiorna i tipi di porta di rete"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCS-NG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Data di importazione in GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Ultimo aggiornamento dei dati OCS-NG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Aggiornamento automatico OCS-NG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agente dell'inventario"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCS-NG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCS-NG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Data ultima connessione OCS-NG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP sorgente"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr "Uptime"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registro"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Chiave/valore"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nome OCS-NG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "Server OCS-NG"
msgstr[1] "server OCS-NG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr "Abilita proxy"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "Indirizzo proxy"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr "Nome del servizio"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr "Nome processo"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr "Importa con SNMP"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "OCS-NG link"
msgstr[1] "OCS-NG link"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Collegamento possibile"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Importazione rifiutata"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nuovo computer creato in GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Collegato con il computer"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Campo bloccato"
msgstr[1] "Campi bloccati"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr "Non stai utilizzando \"locks\" - Verifica le impostazioni per attivarli"
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr "Il campo della data iniziale è bloccato da ocsinventoryng: per favore, sbloccalo prima di aggiornare."
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Configurazione sincronizzazione automatica"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Per favore attiva il plugin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "PC eliminato"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Nessun nuovo computer da eliminare"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Cancella i computer eliminati in OCS-NG"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Computer importati dalle azioni automatiche"
@@ -237,14 +241,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] "La porta di rete importata è sconosciuta"
msgstr[1] "Le porte di rete importate sono sconosciute"
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Cancella il link tra GLPI ed OCS-NG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Non importati: GLPI non importerà questi elementi"
@@ -252,7 +256,7 @@ msgstr "Non importati: GLPI non importerà questi elementi"
msgid "Successful link"
msgstr "Collegamento eseguito"
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr "Nessuna sincronizzazione: il plugin non sincronizzerà questi elementi"
@@ -264,7 +268,7 @@ msgstr "Informazioni sullo script"
msgid "Processes execution of automatic actions"
msgstr "Processi eseguiti dalle azioni automatiche"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Controlla lo script di importazione OCS-NG"
@@ -277,34 +281,38 @@ msgid "Authorize the OCSNG update"
msgstr "Autorizza l'aggiornamento OCS-NG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Frequenza di aggiornamento del processo"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "secondo"
msgstr[1] "secondi"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Blocco non attivato"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Blocco attivato"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Blocca"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Sblocca"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Tutti i server"
@@ -359,21 +367,21 @@ msgstr "Thread"
msgid "Rules checked"
msgstr "Regole verificate"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Computer importati"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Computer collegati"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Computer non aggiornati"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Computer sincronizzati"
@@ -382,150 +390,154 @@ msgstr "Computer sincronizzati"
msgid "Computers not unique"
msgstr "Computer duplicati"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Swap"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr "Importazione IPDiscover"
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Scelta del server OCS-NG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Se il server OCS-NG non è presente nel menù a discesa, verificare se il profilo può accedervi!"
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr "Importazione IPDiscover"
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr "Collegamento IPDiscover"
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Tutte le subnet mask"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Subnet mask conosciute"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Subnet mask sconosciute"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr "Non inventariato"
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr "Inventariato"
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr "Identificato"
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr "Importato / Collegato"
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr "Modifica subnet mask"
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Nome subnet mask"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Scegli ID"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Inserimento non permesso. E' già presente un oggetto con lo stesso indirizzo MAC."
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr "Nessun nuovo dispositivo da importare con IPDiscover"
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr "Elimina collegamento"
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Data di importazione in GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr "Collegamento"
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "Cancella da OCS-NG"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "Tipo OCS-NG"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr "Tipo GLPI"
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr "Elemento da collegare"
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configurazione del server OCS-NG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importa nuovi computer"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronizza i computer già importati"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Collega nuovi computer da OCS-NG con computer esistenti in GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Script eseguiti dalle azioni automatiche"
@@ -563,28 +575,28 @@ msgstr "Devi configurare il server OCS-NG"
msgid "Add a OCSNG server"
msgstr "Aggiungi un server OCS-NG"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "Tipo OCS-NG"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "Tipo OCS-NG MIB"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Crea una voce per definire questo tipo"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Crea una mappatura"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "vuoto"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Nessun tipo di porta di rete sconosciuta da OCS-NG"
@@ -626,15 +638,15 @@ msgstr "Trasforma le porte sconosciute che corrispondono"
msgid "Create"
msgstr "Crea"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr "Condivisioni di rete"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Percorso"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr "Quota"
@@ -652,15 +664,15 @@ msgstr "Elementi che non soddisfano la regola"
msgid "Elements not match with the rule by automatic actions"
msgstr "Elementi che non soddisfano la regola delle azioni automatiche"
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr "Verifica delle regole di assegnazione per entità e posizione"
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr "Nessuna regola soddisfatta"
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr "Errore nei dati"
@@ -668,856 +680,861 @@ msgstr "Errore nei dati"
msgid "Verified rules"
msgstr "Regole verificate"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Non può influenzare un'entità"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Criterio di unicità non verificato"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Importazione rifiutata da una regola"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Azioni da fare sul computer"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Invia ad OCS-NG l'avviso di importazione non riuscita"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Avviso di importazione non riuscita"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr "Informationi importate da OCS-NG"
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interfaccia OCS-NG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forza la sincronizzazione"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr "Informationi importate da OCS Inventory NG SNMP"
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr "Oggetto importato"
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr "Oggetto collegato"
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr "Forza sincronizzazione SNMP"
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr "Data dell'ultimo inventario OCS-NG SNMP"
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr "Informationi importate da OCS-NG IPDiscover"
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr "ID del dispositivo OCS-NG"
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr "Non sono presenti computer nel database OCS-NG"
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr "Test checksum"
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importato da OCS-NG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Cancella in OCS-NG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Collega con un computer in OCS-NG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "L'ID del computer in OCS-NG è cambiato da %1$s a %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "Il TAG del computer in OCS-NG è cambiato da %1$s a %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr "Impossibile collegare questo computer, il numero seriale è nella blacklist (%d)"
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr "Impossibile collegare questo computer, l'UUID è nella blacklist (%d)"
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Impossibile eseguire l'importazione, il computer in GLPI è già collegato ad un elemento di OCS-NG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "I computer non verificano nessuna regola"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Computer duplicati"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Computer la cui importazione è rifiutata da una regola"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr "Oggetti SNMP importati"
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr "Oggetti SNMP sincronizzati"
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr "Oggetti SNMP collegati"
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr "Oggetti SNMP non aggiornati"
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr "Oggetti SNMP non importati"
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr "IPDiscover: oggetti importati"
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr "IPDiscover: oggetti sincronizzati"
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr "IPDiscover: oggetti non aggiornati"
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr "IPDiscover: oggetti non importati"
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr "Statistiche dell'importazione SNMP di OCS-NG"
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr "Statistiche di importazione di OCS-NG IPDISCOVER"
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Statistiche dei collegamenti ad OCS-NG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr "Dati da importare"
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opzioni di importazione"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr "Cronologia generale"
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Pannelo di controllo di OCS-NG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Modalità esperto"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Database in UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configurazione del server OCS-NG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr "Impostazioni del gestore delle regole"
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr "Impostazioni per selezionare l'entità degli elementi importati"
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr "Impostazioni per scegliere i criteri di collegamento degli elementi"
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr "Verifica le impostazioni: dati da importare"
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Il server selezionato non è attivo. Importazione e sincronizzazione non saranno disponibili"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informazioni generali"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Attenzione: le regole per l'importazione di entità dipendono dai campi selezionati"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Dipende dalle importazioni del BIOS"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr "Informazioni utente"
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr "Influenza l'utente dal contatto"
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr "Dipende dall'importazione del contatto"
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr "Influenza la posizione dell'utente per impostazione predefinita"
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr "Influenza il gruppo principale dell'utente per impostazione predefinita"
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr "Dopo la versioner 7006 di OCS Inventory NG"
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr "Dopo la versioner 7009 di OCS Inventory NG e dipende dall'importazione BIOS"
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr "Oggetti collegati"
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importazione globale"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importa unità"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Importa unità per numero di serie"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Importa solo il numero di serie dell'unità"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Importazione globale: tutto è importato ma il materiale è gestito a livello globale (senza duplicati)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Importazione singola: tutto è importato così come è"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr "OCS Inventory NG plugins"
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr "Licenze Microsoft Office"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr "Deve essere installato il Plugin OfficePack per OCS-NG (https://github.com/PluginsOCSInventory-NG/officepack)"
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr "Antivirus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr "Deve essere installato il Plugin Security per OCS-NG (https://github.com/PluginsOCSInventory-NG/security)"
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr "Deve essere installato il Plugin Uptime per OCS-NG (https://github.com/PluginsOCSInventory-NG/uptime)"
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr "Impostazione Windows Update"
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr "Deve essere installato il Plugin Winupdate per OCS-NG (https://github.com/PluginsOCSInventory-NG/winupdate)"
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr "Deve essere installato il Plugin Teamviewer per OCS-NG (https://github.com/PluginsOCSInventory-NG/teamviewer)"
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr "Impostazioni proxy"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr "Deve essere installato il Plugin Navigator Proxy Setting per OCS-NG (https://github.com/PluginsOCSInventory-NG/navigatorproxysetting)"
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr "Utente Windows"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr "Deve essere installato il Plugin Winusers per OCS-NG (https://github.com/PluginsOCSInventory-NG/winusers)"
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr "Sistema Operativo"
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr "Deve essere installato il Plugin OSInstall per OCS-NG (https://github.com/PluginsOCSInventory-NG/osinstall)"
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr "Deve essere installato il Plugin Networkshare per OCS-NG (https://github.com/PluginsOCSInventory-NG/networkshare)"
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr "Servizio"
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr "Deve essere installato il Plugin Service per OCS-NG (https://github.com/PluginsOCSInventory-NG/services)"
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr "Processo in esecuzione"
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr "Deve essere installato il Plugin Running Process per OCS-NG (https://github.com/PluginsOCSInventory-NG/runningProcess)"
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informazioni amministrative OCS-NG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr "Attiva cronologia"
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr "Registro del sistema"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr "Registro del BIOS"
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr "Registro dei dispositivi"
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr "Registro dei volumi"
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr "Registro della rete"
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr "Registro dei monitor collegati"
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr "Registro delle stampanti collegate"
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr "Registro delle periferiche collegate"
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr "Registro del software installato"
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr "Registro delle macchine virtuali"
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr "Registro delle informazioni amministrative"
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Indirizzo web della console OCS-NG (URL)"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limita l'importazione ai seguenti tag (usa $ come separatore, se assente importa tutti)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Escludi i seguenti tag (usa $ come separatore, se assente include tutti)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Stato predefinito"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportamento quando si scollega"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr "Mantieni collegamento"
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr "Sposta il collegamento nel cestino ed aggiungi un blocco"
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr "Elimina definitivamente il collegamento"
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr "Definisci l'azione da fare sul collegamento con altri oggetti quando il computer sarà scollegando da essi"
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Usa il dizionario software di OCS-NG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr "Se il parametro \"Usa il dizionario software di OCS-NG\" è selezionato, nessun software sarà importato prima che esso sia stato configurato"
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Numero di elementi da sincronizzare tramite le azioni automatiche di OCS-NG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr "Le attività automatiche di OCS-NG sono abilitate se il server non è nella modalità esperto"
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr "Le attività automatiche di OCS-NG sincronizzano i computer esistenti e non importano nuovi computer"
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr "Se vuoi importare nuovi computer, disattivare questo parametro, abilita la modalità esperto e utilizza script da sistema"
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportamento alla cancellazione di un computer in OCS-NG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Cambio dello stato %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Database"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standard (consente impostazioni manuali)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expert (completamente automatizzato, per grandi distibuzioni)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Tipo di connessione"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr "Reload checksum"
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Host"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "Come http://127.0.0.1 per il metodo SOAP"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Metodo di sincronizzazione"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr "Usa le azioni automatiche per eliminare gli agenti vecchi & cancellarli da OCS-NG"
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr "L'uso delle azioni automatiche ripristina i computer eliminati"
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr "Numero di giorni per il ripristino di computer dalla data dell'ultimo inventario"
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr "Utilizza le azioni automatiche per controllare le regole di assegnazione ad entità"
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr "Utilizza le azioni automatiche per controllare ed inviare una notifica per le macchine che non rispettano più le regole di posizione e di assegnazione ad entità"
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr "Usa il blocco automatico"
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr "Elimina computer in OCS-NG"
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr "Elimina computer"
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Mi sto connettendo al database"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Connessione al database fallita"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versione OCS-NG non valida: richiede almeno RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Configurazione OCS-NG non valida (l'opzione TRACE_DELETED deve essere attivata)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Connessione al database riuscita"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Configurazione e versione OCS-NG valide"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Inserimento non permesso. Il server OCS-NG esista già."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr "Impossibile collegare questo computer, il numero seriale è nella blacklist (%d)"
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr "Impossibile collegare questo computer, l'UUID è nella blacklist (%d)"
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Impossibile eseguire l'importazione, il computer in GLPI è già collegato ad un elemento di OCS-NG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Swap"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Esiste in GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Esiste in OCS-NG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Nessun elemento da cancellare"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Nessun nuovo computer da aggiornare"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computer aggiornati in OCS-NG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronizza"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Aggiorna i computer"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Attenzione! I dati importati (vedi la tua configurazione) sovrascriveranno quelli esistenti"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modo importazione manuale"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Disabilita anteprima"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Abilita anteprima"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Controlla prima che i duplicati siano correttamente gestiti in OCS-NG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importa"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Soddisfa la regola?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Destinazione"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr "Numeri di serie nella blacklist"
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr "UUID nella blacklist"
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr "MAC nella blacklist"
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr "IP nella blacklist"
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr "Attenzione! Questo computer è già collegato ad un altro computer OCS-NG."
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Nessuna nuova macchina da importare"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "Software eliminato dalla sincronizzazione con OCS-NG"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr "Elimina computer in OCS-NG"
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr "Elimina computer"
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr "Esegue lo script perla sincronizzazione OCS-NG"
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr "Elimina i vecchi agenti & cancellali da OCS-NG"
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr "Ripristina computer alla data dell'ultimo inventario"
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr "Eliminazione vecchio agent eseguita"
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr "Eliminazione vecchio agent fallita"
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr "Eliminazione computer eseguita"
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr "Eliminazione computer fallita"
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr "Ripristino computer eseguito"
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr "Ripristino computer fallito"
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr "Esegue lo script perla sincronizzazione OCS-NG dal server"
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "I computer non verificano nessuna regola"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Computer duplicati"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Computer la cui importazione è rifiutata da una regola"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr "Oggetti SNMP importati"
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr "Oggetti SNMP sincronizzati"
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr "Oggetti SNMP collegati"
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr "Oggetti SNMP non aggiornati"
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr "Oggetti SNMP non importati"
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr "IPDiscover: oggetti importati"
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr "IPDiscover: oggetti sincronizzati"
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr "IPDiscover: oggetti non aggiornati"
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr "IPDiscover: oggetti non importati"
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr "Statistiche dell'importazione SNMP di OCS-NG"
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr "Statistiche di importazione di OCS-NG IPDISCOVER"
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Statistiche dei collegamenti ad OCS-NG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr "Versione build"
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr "Data di installazione"
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr "Codifica dei caratteri"
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr "Codice Nazione"
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr "Lingua del SO"
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr "Fuso orario"
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr "Localizzazione"
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Server OCS-NG autorizzato"
msgstr[1] "Server OCS-NG autorizzati"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Sincronizzazione manuale"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Visualizza le informazioni OCS-NG"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr "Importa computer"
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr "Collega computer"
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr "URL configurazione automatica"
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr "Non usare proxy per"
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d chiave nel registro trovata"
msgstr[1] "%d chiavi nel registro trovate"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Hive"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Nessuna chiave trovata nel registro"
@@ -1532,47 +1549,47 @@ msgstr "Avvisi su computer che non rispettano più le regole per l'assegnazione
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr "Elementi che non soddisfano le regole di assegnazione all'entità %s: %s"
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr "ID processo"
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr "Memoria processo"
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr "Riga comando"
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr "Azienda"
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr "Nome completo"
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr "Stato del servizio"
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr "Tipo di avvio"
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr "Percorso"
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr "Sessione"
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr " Codice di uscita"
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr "Codice di uscita speciale"
@@ -1769,93 +1786,97 @@ msgid "See Setup : SNMP Import before"
msgstr "Verifica le impostazioni: Importa con SNMP"
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr "Importa nuovi dispositivi con SNMP"
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr "Informazioni cartucce"
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr "Informazioni sui vassoi"
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr "Memoria stampante"
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr "Memoria computer"
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr "Filtra lista oggetti SNMP"
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr "Per tipo di elemento"
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr "Per IP"
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr "Importa nuovi dispositivi con SNMP in GLPI"
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr "SNMP: contatto"
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr "SNMP: posizione"
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr "Tipo SNMP"
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr "Tipo di elemento da creare"
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr "Nessun nuovo dispositivo SNMP da importare"
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr "Nessun nuovo dispositivo SNMP da aggiornare"
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr "Dispositivi SNMP aggiornati in OCS-NG"
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr "Oggetto GLPI"
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr "Dispositivo OCS SNMP"
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr "Aggiorna dispositivi SNMP"
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "Software eliminato dalla sincronizzazione con OCS-NG"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr "Teamviewer access"
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr "Teamviewer ID"
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr "Teamviewer direct access"
@@ -1920,54 +1941,54 @@ msgstr "Cancella i processi"
msgid "Delete processes after"
msgstr "Cancella i processi dopo"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr "Windows Update"
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr "Opzioni AU"
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr "Data pianificata per l'installazione"
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr "Utima esecuzione riuscita"
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr "Rilevamento riuscito"
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr "Download eseguito"
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr "Sono richiesti gli aggiornamenti automatici e l'utente può configurarli"
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr "Scarica automaticamente e pianifica l'installazione"
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr "Scarica automaticamente e notifica l'installazione"
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "Notifica prima del download"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr "Disabilita AU"
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Disabilitato"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr "SID"
diff --git a/locales/ja_JP.mo b/locales/ja_JP.mo
index 162b513e..2dcf5add 100644
Binary files a/locales/ja_JP.mo and b/locales/ja_JP.mo differ
diff --git a/locales/ja_JP.po b/locales/ja_JP.po
index f063d783..51b84d6d 100644
--- a/locales/ja_JP.po
+++ b/locales/ja_JP.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Japanese (Japan) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/ja_JP/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,207 +18,211 @@ msgstr ""
"Language: ja_JP\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "前回のOCSNG一覧日付"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "レジストリ"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "キー/値"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG名"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -228,14 +232,14 @@ msgid "Unknown imported network port type"
msgid_plural "Unknown imported network ports types"
msgstr[0] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "GLPI-OCSNG間のリンクを整理"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "インポート無し:プラグインはデータエレメントをインポートしません"
@@ -243,7 +247,7 @@ msgstr "インポート無し:プラグインはデータエレメントをイ
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -255,7 +259,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -268,33 +272,37 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -348,21 +356,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -371,150 +379,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "OCSNGサーバの選択"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "GLPIにインポートされた日付"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "新しいコンピュータをインポート"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "インポートされたコンピュータを同期"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -552,28 +564,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -614,15 +626,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -640,15 +652,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -656,854 +668,859 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "OCSNGから削除された"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "OCSNGコンピュータとのリンク"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "インポートのオプション"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "一般情報"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "グローバルインポート"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "ユニットインポート"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "シリアルナンバーにおけるユニットインポート"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG管理情報"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "OCSNGコンソールのURL"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "以下のタグだけをインポートします(区切り文字は$で、$自体は意味を持ちません)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "以下のタグは除外します。(区切り文字は$で、$自体は意味を持ちません)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "初期値"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "OCSNGソフトウェアリストを使用"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "OCSNG自動実行で同期するアイテム数"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "無効なOCSNGバージョン(RC3が必要)"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "有効なOCSNGの設定及びバージョン"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "新しく更新されたコンピュータはありません"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "コンピュータをOCSNGに更新"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "同期を取る"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "コンピュータをアップデート"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "手動インポートモード"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "プレビューを有効にする"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "インポート"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "ルールに適合していますか?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "新しくインポートされたコンピュータはありません"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "登録にキーが見つかりません"
@@ -1518,47 +1535,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1755,93 +1772,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1906,54 +1927,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/lt_LT.mo b/locales/lt_LT.mo
index c40e2767..cfdd3560 100644
Binary files a/locales/lt_LT.mo and b/locales/lt_LT.mo differ
diff --git a/locales/lt_LT.po b/locales/lt_LT.po
index 5454a34a..b7da6a58 100644
--- a/locales/lt_LT.po
+++ b/locales/lt_LT.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/lt_LT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,117 +19,121 @@ msgstr ""
"Language: lt_LT\n"
"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registras"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Vardas/reikšmė"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -138,29 +142,29 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
@@ -168,23 +172,23 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
@@ -192,43 +196,43 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -241,14 +245,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Nėra įkelties: papildinys neįkels šių elementų"
@@ -256,7 +260,7 @@ msgstr "Nėra įkelties: papildinys neįkels šių elementų"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -268,7 +272,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -281,10 +285,14 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
@@ -292,25 +300,25 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -367,21 +375,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -390,150 +398,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Įkelti duomenis į GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Įkelti naujus kompiuterius"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -571,28 +583,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -636,15 +648,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -662,15 +674,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -678,815 +690,820 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Įkelties sąlygos"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Bendrai"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Visuminis įkėlimas"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Apriboti įkėlimą iki šių žymų (skirtuko $, nothing for all)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Numatytoji būsena"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sinchronizuoti"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Rankinė įkeltis"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Aktyvinti peržiūrą"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importas"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Atitinka taisyklę ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
@@ -1494,31 +1511,31 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1527,11 +1544,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Nerastas vardas registre"
@@ -1546,47 +1563,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1783,93 +1800,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1934,54 +1955,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/nl_NL.mo b/locales/nl_NL.mo
index 9496cdc0..c3a71def 100644
Binary files a/locales/nl_NL.mo and b/locales/nl_NL.mo differ
diff --git a/locales/nl_NL.po b/locales/nl_NL.po
index c21acd41..0a077c2c 100644
--- a/locales/nl_NL.po
+++ b/locales/nl_NL.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Dutch (Netherlands) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/nl_NL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +18,214 @@ msgstr ""
"Language: nl_NL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
-msgstr ""
+msgstr "Niet geïmporteerde computers door automatische actie"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Import herstarten"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Verwijder de computer uit OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Forceer synchronisatie OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr "Blokkeer velden"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Deblokkeer velden"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
-msgstr ""
-
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+msgstr "Bijgewerkte netwerkpoort types"
+
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
-msgstr ""
+msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "GLPI importeer datum"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Datum laatste OCS bijwerking in GLPI"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Automatische update OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Laatste connectie OCSNG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "Bron IP"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
-msgstr ""
+msgstr "Tijd actief"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Register"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Sleutel/waarde"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG naam"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "OCSNG server"
+msgstr[1] "OCSNG servers"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr "Proxy ingeschakeld"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "Proxy adres"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
-msgstr ""
+msgstr "Serivce naam"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
-msgstr ""
+msgstr "Proces naam"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
-msgstr ""
+msgstr "SNMP Importeren"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "OCSNG link"
+msgstr[1] "OCSNG linken"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
-msgstr ""
+msgstr "Link mogelijk"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Import geweigerd"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nieuwe computer aangemaakt in GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Link met computer"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Geblokkeerd veld"
+msgstr[1] "Geblokkeerde velden"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
-msgstr ""
+msgstr "De startdatum is geblokkeerd door ocsinventoryng, maak dit eerst vrij alvorens te updaten."
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Automatische synchronisatie configuratie"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Activeer de plugin aub"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "PC is verwijderd"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Geen nieuwe computers om te verwijderen"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
-msgstr ""
+msgstr "Leeg OCSNG verwijderde computers"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Geimporteerde computers door automatische actie"
@@ -229,27 +233,27 @@ msgstr "Geimporteerde computers door automatische actie"
#: front/networkport.php:34 inc/menu.class.php:97 inc/networkport.class.php:47
msgid "Unknown imported network port type"
msgid_plural "Unknown imported network ports types"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Onbekende import netwerkpoort type"
+msgstr[1] "Onbekende import netwerkpoort types"
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Verwijder koppelingen tussen GLPI en OCS"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Geen import: de plug-in zal deze onderdelen niet importeren"
#: front/ocsngsnmp.link.php:79
msgid "Successful link"
-msgstr ""
+msgstr "Link geslaagd"
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
-msgstr ""
+msgstr "Geen synchronisatie: de plugin gaat deze elementen niet synchroniseren"
#: front/thread.form.php:34
msgid "Information about the script"
@@ -259,9 +263,9 @@ msgstr "Informatie over het script"
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
-msgstr ""
+msgstr "Controlleer OCSNG importeer script"
#: inc/config.class.php:139
msgid "Show processes where nothing was changed"
@@ -272,52 +276,56 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
-msgid "Refresh information of a process every"
+msgid "Log imported computers"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:160
+msgid "Refresh information of a process every"
+msgstr "Vernieuw procesinformatie elke"
+
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "seconde"
+msgstr[1] "seconden"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
-msgstr ""
+msgstr "Lock niet geactiveerd"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
-msgstr ""
+msgstr "Lock geactiveerd"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
-msgstr ""
+msgstr "Blokkeer"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
-msgstr ""
+msgstr "Deblokkeren"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Alle servers"
#: inc/dashboard.class.php:59 inc/dashboard.class.php:104
msgid "Last synchronization of computers by month"
-msgstr ""
+msgstr "Laatste synchronisatie van computers volgens maand"
#: inc/dashboard.class.php:60 inc/dashboard.class.php:312
msgid "Detail of imported computers"
-msgstr ""
+msgstr "Detail van geïmporteerde computers"
#: inc/dashboard.class.php:110
msgid "Computers number"
-msgstr ""
+msgstr "Computers nummer"
#: inc/dashboard.class.php:208 inc/dashboard.class.php:375
msgid "No data available"
-msgstr ""
+msgstr "Geen data beschikbaar"
#: inc/dashboard.class.php:248
msgid "OCS Inventory NG"
@@ -354,21 +362,21 @@ msgstr ""
msgid "Rules checked"
msgstr "Regels aangeduid"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Geïmporteerde computers"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Gelinkte computers"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Computers die niet bijgewerkt zijn"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Gesynchroniseerde computers"
@@ -377,150 +385,154 @@ msgstr "Gesynchroniseerde computers"
msgid "Computers not unique"
msgstr "Niet unieke computers"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Kies een OCS server"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Alle subnetten"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Gekende subnetten"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Niet gekende subnetten"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr "Niet geïnventariseerd"
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr "Geïnventariseerd"
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr "Geïdentificeerd"
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr "Geïmporteerd / Gelinkt"
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr "Wijzig subnet"
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Subnet naam"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Kies ID"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Onmogelijk om toe te voegen. Er bestaat reeds een object met hetzelfde MAC adres."
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr "Verwijder link"
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Datum importeren in GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr "Link"
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "Verwijder van OCSNG"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "OCS Type"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
-msgstr ""
+msgstr "GLPI Type"
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr "Item om te linken"
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configuratie van OCSNG Server"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Import of nieuwe computers"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synchronisatie van de reeds geïmporteerde computers"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Link nieuwe OCSNG computers met bestaande GLPI computers"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -540,7 +552,7 @@ msgstr ""
#: inc/menu.class.php:163
msgid "Server Setup"
-msgstr ""
+msgstr "Server Installatie"
#: inc/menu.class.php:165
msgid "Inventory Import"
@@ -558,36 +570,36 @@ msgstr "Je moet een OCSNG server configureren"
msgid "Add a OCSNG server"
msgstr "Voeg een OCSNG server toe"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
-msgstr ""
+msgstr "OCS TYPE"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
-msgstr ""
+msgstr "OCS MIB TYPE"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "leeg"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
#: inc/networkporttype.class.php:47
msgid "Network port type"
msgid_plural "Network port types"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Netwerkpoort type"
+msgstr[1] "Netwerkpoort types"
#: inc/networkporttype.class.php:127
msgid "Any kind"
@@ -595,7 +607,7 @@ msgstr ""
#: inc/networkporttype.class.php:162
msgid "OCS TYPE MIB"
-msgstr ""
+msgstr "OCS TYPE MIB"
#: inc/networkporttype.class.php:165
msgid "Corresponding Network Port type"
@@ -611,7 +623,7 @@ msgstr ""
#: inc/networkporttype.class.php:174
msgid "Wifi card Version"
-msgstr ""
+msgstr "Wifi kaart versie"
#: inc/networkporttype.class.php:180
msgid "Transform unknown ports that match"
@@ -621,22 +633,22 @@ msgstr ""
msgid "Create"
msgstr "Maak"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
-msgstr ""
+msgstr "Gedeelde netwerk locaties"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Pad"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
-msgstr ""
+msgstr "Quota"
#: inc/notificationtargetnotimportedcomputer.class.php:97
#: inc/notimportedcomputer.class.php:73 inc/notimportedcomputer.class.php:267
msgid "Device ID"
-msgstr ""
+msgstr "Apparaat ID"
#: inc/notificationtargetruleimportentity.class.php:44
#: inc/ruleimportentity.class.php:49
@@ -647,872 +659,877 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
-msgstr ""
+msgstr "Gegevens fout"
#: inc/notimportedcomputer.class.php:63
msgid "Verified rules"
msgstr "Gecontroleerde regels"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
+msgstr "OCS NG Interface"
+
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forceer synchronisatie"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr "Geïmporteerd object"
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr "Gelinkt object"
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr "Forceer SNMP synchronisatie"
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
-msgstr ""
+msgstr "Checksum test"
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
-msgstr ""
+msgstr "Geïmporteerd uit OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Verwijderd uit OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Gekoppeld met een OCS computer"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
-msgid "Datas to import"
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Duplicate computers"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Computers die niet konden geïmporteerd worden omdat ze werden geweigerd door een regel"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
+msgid "Datas to import"
+msgstr "Gegevens om te importeren"
+
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Importopties"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
-msgstr ""
+msgstr "Algemene geschiedenis"
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
-msgstr ""
+msgstr "OCSNG console"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
-msgstr ""
+msgstr "Database in UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Algemene computerinformatie"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
-msgstr ""
+msgstr "Gebruikersinformatie"
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
-msgstr ""
+msgstr "Gelinkte objecten"
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Allesomvattende import"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Unit importation"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Eenheid import op serienummer"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Importeer enkel unit serie nummer"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
-msgstr ""
+msgstr "OCS Inventory NG plugins"
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
-msgstr ""
+msgstr "Microsoft Office licenties"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
-msgstr ""
+msgstr "Anti-Virus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
-msgstr ""
+msgstr "Veiligheidsplugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/security) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
-msgstr ""
+msgstr "Windows Update Status"
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
-msgstr ""
+msgstr "Winupdate Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/winupdate) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
-msgstr ""
+msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
-msgstr ""
+msgstr "Teamviewer Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/teamviewer) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
-msgstr ""
+msgstr "Proxy Instellingen"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
-msgstr ""
+msgstr "Navigator Proxy Setting Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/navigatorproxysetting) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
-msgstr ""
+msgstr "Windows gebruikers"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
-msgstr ""
+msgstr "Winusers Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/winusers) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
-msgstr ""
+msgstr "OS informatie"
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
-msgstr ""
+msgstr "OSInstall Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/osinstall) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
-msgstr ""
+msgstr "Networkshare Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/networkshare) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
-msgstr ""
+msgstr "Service"
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
-msgstr ""
+msgstr "Service Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/services) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
-msgstr ""
+msgstr "Draaiende processen"
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
-msgstr ""
+msgstr "Running Process Plugin voor OCSNG (https://github.com/PluginsOCSInventory-NG/runningProcess) moet geïnstalleerd zijn"
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG Administratieve Informatie"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
-msgstr ""
+msgstr "Systeemgeschiedenis"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
-msgstr ""
+msgstr "Bios geschiedenis"
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
-msgstr ""
+msgstr "Apparaat geschiedenis"
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
-msgstr ""
+msgstr "Volume geschiedenis"
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
-msgstr ""
+msgstr "Netwerkgeschiedenis"
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
-msgstr ""
+msgstr "Plugins geschiedenis"
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL van de OCSNG console"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Beperk het importeren tot de volgende extensies (separator $, niets indien alle)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Sluit de volgende tags uit (scheidingsteken $, nothing voor alles)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Standaard status"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Maak gebruik van de software dictionary in OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Aantal computers die nog gesynchroniseerd moeten worden d.m.v OCSNG actie"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Gevolgen van de verwijdering van een computer uit OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Verander naar status %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Ongeldige OCSNG-versie: RC3 noodzakelijk"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Geldige OCSNG versie en configuratie"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Onmogelijk toe te voegen. De OCSNG server bestaat reeds"
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Bestaat in GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Bestaat in OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Geen item om op te schonen"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Geen nieuwe computer om bij te werken"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computers bijgewerkt in OCS"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synchronisatie"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Computers bijwerken"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Handmatige import mode"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activeer het overzicht"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Controleer eerst of de doublures correct beheerd worden door OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importeren"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Controleer de regel ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Doel locatie"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Geen nieuwe computer om te importeren"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Duplicate computers"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Computers die niet konden geïmporteerd worden omdat ze werden geweigerd door een regel"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Geen sleutel gevonden in register"
@@ -1527,47 +1544,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,103 +1781,107 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr "Printer Geheugen"
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr "Computer Geheugen"
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
-msgstr ""
+msgstr "Contacteer SNMP"
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
-msgstr ""
+msgstr "SNMP Locatie"
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
-msgstr ""
+msgstr "SNMP Type"
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
-msgid "Teamviewer access"
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:53
+msgid "Teamviewer access"
+msgstr "Teamviewer toegang"
+
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
-msgstr ""
+msgstr "Teamviewer ID"
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
-msgstr ""
+msgstr "Teamviewer directe toegang"
#: inc/thread.class.php:71
msgid "Back to processes list"
-msgstr ""
+msgstr "Terug naar proceslijst"
#: inc/thread.class.php:107
msgid "Process information"
-msgstr ""
+msgstr "Proces informatie"
#: inc/thread.class.php:112 inc/thread.class.php:315
msgid "Beginning date of execution"
@@ -1872,7 +1893,7 @@ msgstr ""
#: inc/thread.class.php:121 inc/thread.class.php:323
msgid "Computers refused"
-msgstr ""
+msgstr "Geweigerde computers"
#: inc/thread.class.php:122 inc/thread.class.php:324
msgid "Process time execution"
@@ -1892,7 +1913,7 @@ msgstr ""
#: inc/thread.class.php:307
msgid "See all servers"
-msgstr ""
+msgstr "Bekijk alle servers"
#: inc/thread.class.php:314
msgid "Number of threads"
@@ -1900,12 +1921,12 @@ msgstr ""
#: inc/thread.class.php:443
msgid "Maximum"
-msgstr ""
+msgstr "Maximum"
#. TRANS: means computers by second
#: inc/thread.class.php:486
msgid "pc/s"
-msgstr ""
+msgstr "pc's"
#: inc/thread.class.php:596
msgid "Clean processes"
@@ -1915,54 +1936,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
-msgstr ""
+msgstr "Windows Updates"
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
-msgstr ""
+msgstr "AU Opties"
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
-msgstr ""
+msgstr "Geplande installatie datum"
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
-msgstr ""
+msgstr "Laatst"
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr "Automatisch downloaden en installatie plannen"
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr "Automatisch downloaden en verwittigen van installatie"
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "Verwittig voor het downloaden"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
-msgstr ""
+msgstr "Schakel AU uit"
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Uitgeschakeld"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
-msgstr ""
+msgstr "SID"
diff --git a/locales/nn_NO.mo b/locales/nn_NO.mo
index f38d55b6..8fec4273 100644
Binary files a/locales/nn_NO.mo and b/locales/nn_NO.mo differ
diff --git a/locales/nn_NO.po b/locales/nn_NO.po
index 99107ebd..0659611b 100644
--- a/locales/nn_NO.po
+++ b/locales/nn_NO.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/nn_NO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,210 +17,214 @@ msgstr ""
"Language: nn_NO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Register"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Nøkkel / verdi"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -231,14 +235,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Ingen import: plugin vil ikke importere disse elementene"
@@ -246,7 +250,7 @@ msgstr "Ingen import: plugin vil ikke importere disse elementene"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -258,7 +262,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -271,34 +275,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -353,21 +361,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -376,150 +384,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Import dato i GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Import nye datamaskiner"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synkronisete datamaskiner allerede importert"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -557,28 +569,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -620,15 +632,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -646,15 +658,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -662,856 +674,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Import Instillinger"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Generell informasjon"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Global import"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Enhet import"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Enhet import på serienummer"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Begrense importen til følgende koder (separator $ ingenting for alle)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Utelat følgende koder (separator $ ingenting for alle)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Standard status"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synkronisere"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Oppdater maskiner"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Manuell import modus"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Aktiver forhåndsvisning"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importer"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Ingen nøkkel funnet i registeret"
@@ -1526,47 +1543,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1763,93 +1780,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1914,54 +1935,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo
index d57da691..b149fa6e 100644
Binary files a/locales/pl_PL.mo and b/locales/pl_PL.mo differ
diff --git a/locales/pl_PL.po b/locales/pl_PL.po
index 86c65cc3..b8869a65 100644
--- a/locales/pl_PL.po
+++ b/locales/pl_PL.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Polish (Poland) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/pl_PL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,117 +19,121 @@ msgstr ""
"Language: pl_PL\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Ostatnia inwentaryzacja w OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Automatyczna aktualizacja OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "Źródłowy IP"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Rejestr"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Klucz/wartość"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nazwa OCS"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -138,29 +142,29 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "adres Proxy"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr "Nazwa procesu"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr "SNMP Import"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
@@ -168,23 +172,23 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
@@ -192,43 +196,43 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Aktywuj plugin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "PC usunięty"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -241,14 +245,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Wyczyść połączenia pomiędzy GLPI i OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Brak importu: te elementy nie zostaną importowane"
@@ -256,7 +260,7 @@ msgstr "Brak importu: te elementy nie zostaną importowane"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -268,7 +272,7 @@ msgstr "Informacja o skrypcie"
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -281,10 +285,14 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
@@ -292,25 +300,25 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Wszystkie serwery"
@@ -367,21 +375,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -390,150 +398,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Wybierz serwer OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Wszystkie podsieci"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Znane podsieci"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Nieznane podsieci"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Nazwa podsieci"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Wybierz ID"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Nie można dodać obiektu z adresem MAC już istniejącym"
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Import danych do GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "Usuń z OCSNG"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "Typ OCS"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Konfiguracja serwera OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importuj nowe komputery"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synchronizuj komputery poprzednio zaimportowane"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -571,28 +583,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr "Dodaj serwer OCSNG"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "Typ OCS"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "pusty"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -636,15 +648,15 @@ msgstr ""
msgid "Create"
msgstr "Utwórz"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr "Zasoby sieciowe"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Ścieżka"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr "Przydział"
@@ -662,15 +674,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr "Błąd danych"
@@ -678,815 +690,820 @@ msgstr "Błąd danych"
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Wymuś synchronizację"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Usunięte w OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Połącz z komputerem z OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Duplikaty komputerów"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opcje Importu"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "konsola OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informacje ogólne"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Import globalny"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importowane jednostki"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Importowanie pozycji po numerze seryjnym"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr "Licencje MS Office"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr "Antywirus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr "Ustawienia proxy"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr "Użytkownicy windows"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informacje Administracyjne OCS"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr "Historia systemowa"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Adres URL konsoli OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limit importu podążających tagów (separator $, nic dla wszystkich)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Wyłączenie podążających tagów (separator $, brak dla wszystkich)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Status domyślny"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Użyj słownika OCS dla oprogramowania"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Liczba komputerów automatycznie synchronizowanych z OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Baza danych"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Typ połączenia"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Metoda synchronizacji"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr "Usuń komputery"
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Połączenie do bazy"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Niewłaściwa wersja OCSNG - RC3 wymagana"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Poprawna wersja i konfiguracja OCS NG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Nie można dodać. Serwer OCSNG już istnieje."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Istnieje w GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Istnieje w OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Brak nowych maszyn do aktualizacji"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Komputer uaktualniony w OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synchronizuj"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Uaktualnij komputery"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Tryb importu podręcznika"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Wyłącz podgląd"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Aktywuj do podglądu"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Sprawdź wpierw czy duplikaty są poprawnie zarządzane w OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importuj"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Pasuje do wzorca?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Brak nowych komputerów do importowania"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr "Usuń komputery"
+
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr "Uruchom skrypt synchronizacji OCSNG"
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Duplikaty komputerów"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr "Data instalacji"
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr "Kod kraju"
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr "OS Język"
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr "Aktualna strefa czasowa"
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
@@ -1494,31 +1511,31 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1527,11 +1544,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Nie znaleziono klucza w rejestrze"
@@ -1546,47 +1563,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr "Pełna nazwa"
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1783,93 +1800,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1934,54 +1955,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "Powiadom przed pobraniem"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Wyłączony"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr "SID"
diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo
index c2ca8135..fbe27732 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 0aa74720..d0a0e53d 100644
--- a/locales/pt_BR.po
+++ b/locales/pt_BR.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,210 +19,214 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Computadores não importados por ações automáticas"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Reiniciar importação"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importar a entidade"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Excluir um computador do OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Forçar sincronização com OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Destravar campos"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Data de importação no GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Data do último inventário do OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Atualizar automaticamente OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agente de inventário"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "TAG no OCSNG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "ID OCSNG"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registrar"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Chave/Valor"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nome OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "Servidor OCSNG"
msgstr[1] "Servidores OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Link OCSNG"
msgstr[1] "Links OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Campo travado"
msgstr[1] "Campos travados"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Configuração da sincronização automática"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Por favor, ative o plugin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Computadores importados por ações automáticas"
@@ -233,14 +237,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Apagar vínculos entre GLPI e OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Não importar: o plugin não vai importar esses elementos"
@@ -248,7 +252,7 @@ msgstr "Não importar: o plugin não vai importar esses elementos"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -260,7 +264,7 @@ msgstr "Informação sobre o script"
msgid "Processes execution of automatic actions"
msgstr "Execução de processos de ações automáticas"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Verificar script de importação do OCSNG"
@@ -273,34 +277,38 @@ msgid "Authorize the OCSNG update"
msgstr "Autorizar a atualização do OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "renovar informação de um processo a cada"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "segundo"
msgstr[1] "segundos"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Trava não ativar"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Trava ativada"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Travar"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Destravar"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Todos os servidores"
@@ -355,21 +363,21 @@ msgstr "Thread"
msgid "Rules checked"
msgstr "Regras verificadas"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Computadores importados"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Computadores vinculados"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Computadores não atualizados"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Computadores sincronizados"
@@ -378,150 +386,154 @@ msgstr "Computadores sincronizados"
msgid "Computers not unique"
msgstr "Computadores não únicos"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Trocar"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Escolha de um servidor OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Data de importação no GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configuração do servidor OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importar novos computadores"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronizar computadores já importados"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Vincular novos computadores do OCSNG a computadores existentes do GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Execução de scripts de ações automáticas"
@@ -559,28 +571,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "TIPO OCS"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "TIPO MIB OCS"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Cria uma entrada para definição deste tipo"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Criar um mapeamento"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -622,15 +634,15 @@ msgstr ""
msgid "Create"
msgstr "Criar"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Caminho"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -648,15 +660,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -664,856 +676,861 @@ msgstr ""
msgid "Verified rules"
msgstr "Regras verificadas"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Não foi possível afetar uma entidade"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Critérios de unicidade não verificados"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Importação recusada por regra"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Ações a serem feitas no computador"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Falha ao enviar alerta de computadores não importados ao OCSNG"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interface OCS NG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forçar sincronização"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importado do OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Excluido no OCS-NG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Relacionado a um computador do OCS-NG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "O ID de OCSNG do computador mudou de %1$s para %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "O TAG de OCSNG do computador mudou de %1$s para %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Não foi possível importar. Computador do GLPI já é relacionado a um elemento de OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Computadores correspondem a nenhuma regra"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Computadores duplicados"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Computadores cuja importação foi recursada por uma regra"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Estatísticas de vínculos do OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opções de importação"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Console do OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Modo expert de sincronização"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Banco de dados em UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configurações do servidor OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "O servidor selecionado não está ativo. Importação e sincronização não estão disponíveis"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informação geral"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importação global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importação unitária"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Importação unitária por número de série"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Importação unitária por número de série somente"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Importação glocal: tudo será importado, mas o material é gerenciado glocalmente (sem duplicatas)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Importação unitária: tudo é importado como está"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informação administrativa do OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Endereço web do console do OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limitar a importação das seguintes tags (separador $, nada para todos)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Excluir as seguintes tags (separador $, nada para todos)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Status padrão"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportamento quando estiver desconectando"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Usar o dicionário de softwares do OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Número de itens para sincronizar via a ação automática do OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportamento para exclusão de um computador do OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Alterar o estado %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Padrão (permite ações manuais)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Export (completamente automático, para configurações maiores)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Método de sincronização"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Conectando ao banco de dados"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Falha ao conectar ao banco de dados"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versão do OCSNG inválido: RC3 é necessária"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Configuração inválida do OCSNG (TRACE_DELETED deve estar ativo)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Conexão com o banco de dados com sucesso"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Configuração e versão válida do OCSNG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Não foi possível adicionar. O servidor OCSNG já existe."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Não foi possível importar. Computador do GLPI já é relacionado a um elemento de OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Trocar"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existente no GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existente no OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Nenhum item para limpar"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Nenhum computador novo para ser atualizado"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computadores atualizados no OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronizador"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Atualizar computadores"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Cuidado! Os dados importados (veja sua configuração) serão sobrescritos com o existente"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modo importação manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Desabilitar pré-visualização"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Habilitar pré-visualização"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Verificar primeiro se duplicatas foram gerenciados corretamente no OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importar"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Mesma regra?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Localização do alvo"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Nenhum novo computador para ser importado"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Computadores correspondem a nenhuma regra"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Computadores duplicados"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Computadores cuja importação foi recursada por uma regra"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Estatísticas de vínculos do OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Sincronização manual"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Ver informação"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d chave de registro encontrada"
msgstr[1] "%d chaves de registro encontradas"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Grupo"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Nenhuma chave encontrada no registro"
@@ -1528,47 +1545,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1765,93 +1782,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1916,54 +1937,54 @@ msgstr "Apagar processo"
msgid "Delete processes after"
msgstr "Excluir processos depois de"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo
index 338ab10c..0e0ba4f8 100644
Binary files a/locales/pt_PT.mo and b/locales/pt_PT.mo differ
diff --git a/locales/pt_PT.po b/locales/pt_PT.po
index 6be51794..620f3709 100644
--- a/locales/pt_PT.po
+++ b/locales/pt_PT.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +18,214 @@ msgstr ""
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Última data de actualização no OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registro"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Chave/Valor"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nome OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -232,14 +236,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] ""
msgstr[1] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Apagar ligação entre GLPI e OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Sem importação: o plugin não irá importar estes elementos"
@@ -247,7 +251,7 @@ msgstr "Sem importação: o plugin não irá importar estes elementos"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -259,7 +263,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -272,34 +276,38 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -354,21 +362,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -377,150 +385,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Escolha de um servidor OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Importar dados para GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importar máquinas novas"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronização de máquinas já importadas"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -558,28 +570,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -621,15 +633,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -647,15 +659,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -663,856 +675,861 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Removido do OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Ligado com uma máquina OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Máquinas duplicadas"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Máquinas cuja importação é recusada por alguma regra"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Opções de importação"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informações gerais"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Importação global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importação de unidade"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Unidade importada no nº de série"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informação administrativa do OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Endereço web do servidor OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limitar a importação dos seguintes identificadores (separador $, absolutamente nada)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Excluindo os seguintes marcadores (separadores $, nenhum para todos)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Estado por omissão"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Usar o dicionário de software do OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Número de computadores a sincronizar, usando o cron"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Alterar o estado %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versão OCSNG inválida: requer RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Versão OCSNG válida"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existem no GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existem no OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "nenhum artigo para eliminar"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Nenhuma nova maquina a ser actualizada"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Computadores actualizados no OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronize"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Actualizar os computadores"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modo de importação manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Ativar a visualização"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Primeiro, verifique que os duplicados estão controlados no OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importar"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "A regra bate certo?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Localização alvo"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Nenhuma nova máquina a ser importada"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Máquinas duplicadas"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Máquinas cuja importação é recusada por alguma regra"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
msgstr[1] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Nehuma chave da base de registo encontrada"
@@ -1527,47 +1544,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1764,93 +1781,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1915,54 +1936,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/ro_RO.mo b/locales/ro_RO.mo
index c9570c29..f81b3526 100644
Binary files a/locales/ro_RO.mo and b/locales/ro_RO.mo differ
diff --git a/locales/ro_RO.po b/locales/ro_RO.po
index 9fcb9357..8b3b2587 100644
--- a/locales/ro_RO.po
+++ b/locales/ro_RO.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Romanian (Romania) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/ro_RO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,117 +19,121 @@ msgstr ""
"Language: ro_RO\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Calculatoare neimportate prin sincronizarea automată"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Relansare import"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Importă in entitate"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Ştergere calculator în OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Forţează sincroniarea OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Blocheaza campuri"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Deblochează câmpurile"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Modificare tipuri porturi de reţea"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "GLPI import date"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Data ultimului inventar OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Actualizează OCSNG automat"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Agent inventar"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "Tag OCSNG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "ID OCSNG"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Data ultimei conexiuni OCSNG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP Sursă"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registru"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Cheie / valoare"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Nume OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -137,95 +141,95 @@ msgstr[0] "Server OCSNG"
msgstr[1] "Servere OCSNG"
msgstr[2] "Servere OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Link OCSNG"
msgstr[1] "Linkuri OCSNG"
msgstr[2] "Linkuri OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Link posibil"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Import refuzat"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Calculator nou creat în GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Legătură la calculator"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Câmp blocat"
msgstr[1] "Câmpuri blocate"
msgstr[2] "Câmpuri blocate"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Configurare sincronizare automată"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Activaţi vă rog plugin -ul"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "Pc şters"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Niciun nou calculator de şters"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Curăţă calculatoarele şterse OCSNG "
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Calculatoare importate prin sincronizarea automată"
@@ -237,14 +241,14 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Şterge legăturile dintre GLPI şi OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Fara import: plugin-ul nu va importa aceste elemente"
@@ -252,7 +256,7 @@ msgstr "Fara import: plugin-ul nu va importa aceste elemente"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -264,7 +268,7 @@ msgstr "Informaţii despre script"
msgid "Processes execution of automatic actions"
msgstr "Execuţii sincronizări automate"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Control script import OCSNG"
@@ -277,35 +281,39 @@ msgid "Authorize the OCSNG update"
msgstr "Autorizează actualizarea OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Refreshul informaţiilor proceselor la fiecare"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "secundă"
msgstr[1] "secunde"
msgstr[2] "secunde"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Blocaj neactivat"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Blocaj activat"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Blocaj"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Deblocaj"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Toate serverele"
@@ -361,21 +369,21 @@ msgstr "Thread"
msgid "Rules checked"
msgstr "Reguli controlate"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Calculatoare importate"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Calculatoare legate"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Calculatoare neactualizate"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Calculatoare sincronizate"
@@ -384,150 +392,154 @@ msgstr "Calculatoare sincronizate"
msgid "Computers not unique"
msgstr "Calculatoare neunice"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Swap"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Alegere unu server OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Importa data in GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Configurare server OCSNG"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importa noi computere"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Sincronizeaza computerele deja importate"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Leagă noile calculatoare din OSCNG cu cele existente in GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Executare scripturi sincronizare automată"
@@ -565,28 +577,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "OCS TYPE"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS MIB TYPE"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Crează o intrare pentru difinirea acestui tip"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Crează o mapare"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "gol"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -629,15 +641,15 @@ msgstr ""
msgid "Create"
msgstr "Crează"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Calea"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -655,15 +667,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -671,846 +683,851 @@ msgstr ""
msgid "Verified rules"
msgstr "Reguli verificate"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Nu poate afecta o entitate"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Criterii de unicitate neverificate"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Import refuzat de o regulă"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Acţiuni de realizat pe calculator"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Eşec la trimiterea alertelor privind calculatoarel neimportate din OCSNG"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Alertă calculatoare neinportate"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Interfaţa OCSNG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Forţare sincronizare"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importat din OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Sters din OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Conectat la un computer OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "ID -ul calculatorului din OCSNG a fost schimbat de la %1$s la %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "Tag-ul calculatorului din OCSNG a fost schimbat de la %1$s la %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Import imposibil, calculatorul GLPI este deja legat la un element din OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Calculatoare ce nu verifică nicio regulă"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Calculatoare dublicate"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Calculatorul importat este refuzat de o regulă"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Statistici link OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Optiuni de importare"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Consola OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Expert sync mod"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Baza de date în UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Configurare server OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Serverul selectat nu este activ. Importul şi sincronizarea nu este disponibilă"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Informatii generale"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Depinde de import BIOS"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Import global"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Unitatea de import"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Import de unitate pe numarul de serie"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Import unic număr de serie unic"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Import global : totul este importat dar materialul este gestionat global (fără duplicate )"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Import unic: totul este importat asa cum e"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Informaţii adminitrative OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL-ul consolei OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Limita de import pentru urmatoarele tag-uri ($ separator, nimic pentru toate)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Excludeti urmatoarele tag-uri (separator $, nimic pentru toate)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Status implicit"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Comportament la deconectare"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Utilizează dictionarul software OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Numărul elementelor de sincronizat via acţiunii automate OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Comportament la ştergerea unui calculator din OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Schimbă statut %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Baza de date"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standard (permite actiuni manuale)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expert (complet automat, pentru configurări mari )"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Tip conexiune "
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Gazda"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "Ca http://127.0.0.1 pentru SOAP metoda"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Metodă sincronizare"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Conectarea la baza de date"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Eşec la conectarea la baza de date"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Versiune OCSNG nevalidă : necesită RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Configurare OCSNG invalidă (TRACE_DELETED trebuie sa fie activă)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Conectarea la baza de date reuşită"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Configurare şi versiune OCSNG validă"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Adăugare imposibilă. Severul OCSNG deja există."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Import imposibil, calculatorul GLPI este deja legat la un element din OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Swap"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Prezent în GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Prezent în OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Niciun obiect de şters."
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Niciun nou calculator de actualizat"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Calculatoare actualizat în OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Sincronizaţi"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "actualizeaza computerele"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Atenţie! Datele importate ( vezi configurarea ta) vor suprascrie datele existente"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Modul de import manual"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Dezactivare previzualizarea"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Activeaza previzualizarea"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Asiguraţi-vă în prealabil să aveţi corect gestionate dublurile în OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Import"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Se potrivește regula?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Locaţia ţintă"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Niciun nou calculator de importat"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Calculatoare ce nu verifică nicio regulă"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Calculatoare dublicate"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Calculatorul importat este refuzat de o regulă"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Statistici link OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Server OCSNG permis"
msgstr[1] "Servere OCSNG permise"
msgstr[2] "Servere OCSNG permise"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Sincronizare manuală"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Vezi informaţiile OCSNG"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1518,11 +1535,11 @@ msgstr[0] "%d registry key găsit"
msgstr[1] "%d registry key găsiţi"
msgstr[2] "%d registry key găsiţi"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Stup"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Nu a fost gasita nici o cheie in registru"
@@ -1537,47 +1554,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1774,93 +1791,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1925,54 +1946,54 @@ msgstr "Curăţă procesele"
msgid "Delete processes after"
msgstr "Sterge procesele după"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo
index ca95c337..bb6908e4 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 6aea00ee..431d78e8 100644
--- a/locales/ru_RU.po
+++ b/locales/ru_RU.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Russian (Russia) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/ru_RU/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,117 +24,121 @@ msgstr ""
"Language: ru_RU\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "ПК, не импортированные автоматически"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Выполнить импорт"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Импорт в записи"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Удалить ПК из OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Принудительная синхронизация OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Заблокировать поля"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Разблокированные поля"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Обновить типы сетевых портов"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Дата импорта в GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Дата последнего обновления в OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Автоматическое обновление OCSNG"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Агент инвентаризации"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Последняя дата соединения с OCSNG"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP источника"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Реестр"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Ключ/значение"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Имя OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -143,29 +147,29 @@ msgstr[1] "Серверы OCSNG"
msgstr[2] "Серверы OCSNG"
msgstr[3] "Серверы OCSNG"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "Связь с OCSNG"
@@ -173,23 +177,23 @@ msgstr[1] "Связи с OCSNG"
msgstr[2] "Связи с OCSNG"
msgstr[3] "Связи с OCSNG"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Связь существует"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Импорт отменен"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Новый компьютер, созданный в GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Связать с компьютером"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Заблокированное поле"
@@ -197,43 +201,43 @@ msgstr[1] "Заблокированные поля"
msgstr[2] "Заблокированные поля"
msgstr[3] "Заблокированные поля"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Настройка автоматической синхронизации"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Пожалуйста, активируйте плагин"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "ПК удален"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Нет новых ПК для удаления"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "Очистить список удаленных в OCSNG ПК"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "ПК, импортированные автоматически"
@@ -246,14 +250,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Очистить связи между GLPI и OCS"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Нет импорта: плагин не импортировал эти элементы"
@@ -261,7 +265,7 @@ msgstr "Нет импорта: плагин не импортировал эти
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -273,7 +277,7 @@ msgstr "Сведения о скрипте"
msgid "Processes execution of automatic actions"
msgstr "Выполнение процессов автоматизации действий"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Проверить скрипт импорта OCSNG"
@@ -286,10 +290,14 @@ msgid "Authorize the OCSNG update"
msgstr "Разрешить обновление OCSNG"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Обновить сведения по каждому процессу"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "секунда"
@@ -297,25 +305,25 @@ msgstr[1] "секунды"
msgstr[2] "секунды"
msgstr[3] "секунды"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Блокировка не активирована"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Блокировка активирована"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Блокировать"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Разблокировать"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Все серверы"
@@ -372,21 +380,21 @@ msgstr "Поток"
msgid "Rules checked"
msgstr "Правила проверяются"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "ПК для импорта"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "ПК для связывания"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "ПК не обновлены"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "ПК синхронизированы"
@@ -395,150 +403,154 @@ msgstr "ПК синхронизированы"
msgid "Computers not unique"
msgstr "ПК не уникальны"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Своп"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Выбор сервера OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Если вы не нашли свой OCSNG сервер в выпадающем списке, то проверьте права доступа Вашего профиля!"
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Дата импорта в систему GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Параметры сервера "
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Импорт новых компьютеров"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Синхронизация уже импортированных ПК"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Связать новые ПК OCSNG с существующими компьютерами GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Скрипты автоматизации действий"
@@ -576,28 +588,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "Тип OCS"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "Тип OCS MIB"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Создание записи для определения этого типа"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Создать сопоставление"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "пустой"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "Нет неизвестных типов сетевых портов из OCS"
@@ -641,15 +653,15 @@ msgstr ""
msgid "Create"
msgstr "Создать"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Путь"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -667,15 +679,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -683,815 +695,820 @@ msgstr ""
msgid "Verified rules"
msgstr "Проверенные правила"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Невозможно применить запись"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Критерии уникальности не проверены"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Импорт отменен правилом"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Действия, которые будут выполнены на ПК"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "Сбой отправки предупреждения OCSNG о не импортированых ПК"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Не импортированные оповещения ПК"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "Интерфейс OCS NG"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Принудительная синхронизация"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Импортировано из OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Удалить из OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Связан с компьютером из OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "OCSNG ID компьютера изменялся с %1$s на %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "OCSNG TAG компьютера изменялся с %1$s на %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Невозможно импортировать, ПК GLPI уже связан с элементом в OCSNG (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "ПК не проверяют никакие правила"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Дубликаты компьютеров"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Компьютеры, импорт которых отклонён правилами"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "Статистика связей OCSNG"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Опции импорта"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "Консоль OCSNG"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Экспертный режим синхронизации"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "База в UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Параметры сервера OCSNG %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Выбранный сервер не активен. Импорт и синхронизация не доступна"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Общая информация"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Внимание : правила импорта объектов зависит от выбранных полей"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "В зависимости от импорта из BIOS"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Глобальный импорт"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Импорт объекта"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Импорта объекта по серийному номеру"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Импорта только серийного номера объекта"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Глобальный импорт: все импортируется, но материал глобально управляется (без дубликатов)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Модуль импорта: все импортируется как есть"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG Административная информация"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "URL консоли управления OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Ограничить импорт следующими тегами (разделитель $, пустое значение для всех)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Исключить следующие тэги (разделитель $, пусти для всех)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Статус по умолчанию"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Поведение при отключении"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Использовать словарь ПО из OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Количество элементов для синхронизации через запланированные задания (cron)"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Поведение при удалении компьютера в OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Смена статуса %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "База данных"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Стандарт (разрешает действия вручную)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Эксперт (Полностью автоматически, для больших конфигураций)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Тип соединения"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Хост"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "Например http://127.0.0.1 для SOAP"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Метод синхронизации"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Соединение с базой данных"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Сбой соединения с базой данных"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Неправильная версия OCSNG: требуется RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Неправильная конфигурация OCSNG (TRACE_DELETED должен быть активный)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Соединение с базой данных установлено"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Правильная версия и конфигурация OCSNG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Невозможно добавить. Сервер OCSNG уже существует."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Невозможно импортировать, ПК GLPI уже связан с элементом в OCSNG (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Своп"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Существует в GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Существует в OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Нет элемента для очистки"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Нет новых компьютеров для обновления"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Компьютеры, обновленные в OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Синхронизировать"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Обновить компьютеры"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Внимание! Импортированные данные (см. вашу конфигурацию) запишутся поверх существующих"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Режим ручного импорта"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Отключить предпросмотр"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Включить предпросмотр"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Проверьте что управление дубликатами правильно настроено в OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Импорт"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Проверено правилом ?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Местонахождение цели "
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Нет новых компьютеров для импорта"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "ПО удаленное при синхронизации с OCSNG"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "ПК не проверяют никакие правила"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Дубликаты компьютеров"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Компьютеры, импорт которых отклонён правилами"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "Статистика связей OCSNG"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "Разрешенный OCSNG сервер"
@@ -1499,31 +1516,31 @@ msgstr[1] "Разрешенные OCSNG сервера"
msgstr[2] "Разрешенные OCSNG сервера"
msgstr[3] "Разрешенные OCSNG сервера"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Синхронизация вручную"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "См. сведения"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1532,11 +1549,11 @@ msgstr[1] "Найдено %d ключей реестра"
msgstr[2] "Найдено %d ключей реестра"
msgstr[3] "Найдено %d ключей реестра"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Куст реестра"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Нет ключа в реестре"
@@ -1551,47 +1568,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1788,93 +1805,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "ПО удаленное при синхронизации с OCSNG"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1939,54 +1960,54 @@ msgstr "Процесс очистки"
msgid "Delete processes after"
msgstr "Удалить процессы после"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/sk_SK.mo b/locales/sk_SK.mo
index d5c9407d..ee435fe8 100644
Binary files a/locales/sk_SK.mo and b/locales/sk_SK.mo differ
diff --git a/locales/sk_SK.po b/locales/sk_SK.po
index c200ec94..15a10b9a 100644
--- a/locales/sk_SK.po
+++ b/locales/sk_SK.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,117 +18,121 @@ msgstr ""
"Language: sk_SK\n"
"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Počítače nenaimportované automatickými akciami"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Reštartovať import"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Import do subjektu"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Odstrániť počítač v OCSNG"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "Synchronizovať s OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Uzamknúť polia"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Odomknúť polia"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Aktualizovať typy sieťových portov"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "Dátum importu do GLPI"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Dátum poslednej inventarizácie v OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Inventárny agent"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG TAG"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG ID"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Registre"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Kľúč/Hodnota"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "Názov OCSNG"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -137,29 +141,29 @@ msgstr[1] "OCSNG servery"
msgstr[2] "OCSNG servery"
msgstr[3] "OCSNG servery"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
@@ -167,23 +171,23 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Import odmietnutý"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "Nový počítač vytvorený v GLPI"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Uzamknuté pole"
@@ -191,43 +195,43 @@ msgstr[1] "Uzamknuté polia"
msgstr[2] "Uzamknuté polia"
msgstr[3] "Uzamknuté polia"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Konfigurácia automatickej synchronizácie"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Prosím aktivujte plugin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Žiaden nový počítač na vymazanie"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Počítače importované automatickými akciami"
@@ -240,14 +244,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Zmazať prepojenia medzi GLPI a OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Neimportovať: plugin nebude tieto prvky importovať"
@@ -255,7 +259,7 @@ msgstr "Neimportovať: plugin nebude tieto prvky importovať"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -267,7 +271,7 @@ msgstr "Informácie o skripte"
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "Skontrolovať OCSNG importný skript"
@@ -280,10 +284,14 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "Sekunda"
@@ -291,25 +299,25 @@ msgstr[1] "Sekundy"
msgstr[2] "Sekúnd"
msgstr[3] "Sekúnd"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Uzamknutie neaktivované"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Uzamknutie aktivované"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Uzamknúť"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Odomknuť"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Všetky servery"
@@ -366,21 +374,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Importoané počítače"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Aktualizované počítače"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Synchronizované počítače"
@@ -389,150 +397,154 @@ msgstr "Synchronizované počítače"
msgid "Computers not unique"
msgstr "Počítače nie sú jedinečné"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Výber OCSNG servera"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Importovať dátum v GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "Konfigurácia OCSNG servera"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Importovať nové počítače"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Synchronizovať už naimportované počítače"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Spojiť nové OCSNG počítače s existujúcimi počítačmi v GLPI"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -570,28 +582,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -635,15 +647,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Cesta"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -661,15 +673,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -677,815 +689,820 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Import odmietnutý pravidlom"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "OCS NG Rozhranie"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Synchronizovať teraz"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "Importované z OCSNG"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Zmazané v OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "OCSNG ID počítača zmenený z %1$s na %2$s"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "OCSNG TAG počítača zmenený z %1$s na %2$s"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Duplicitné počítače"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Počítače, ktorých import bol odmietnutý na základe pravidiel"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Voľby importu"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "OCSNG konzola"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Expertný synchronizačný mód"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "UTF8 databáza"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "Konfigurácia OCSNG servera %s"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Vybraný server nieje aktívny. Import a synchronizácia nieje dostupná"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Všeobecné informácie"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Globálny import"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Importovanie jednotky"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Globálny import: všetko je importované ale materiál je globálne spravovaný (bez duplikácie)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Import jednotky: všetko je importované tak ako to je"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG administratívne informácie"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Webová adresa konzoly OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Obmezdiť import nasledujúcich tagov (oddeľovač $, nič pre všetky)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Vyhechať nasledujúce tagy (oddeľovač $, nič pre všetko)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Východzí stav"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Chovanie sa pri odpojení"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Použiť číselník softvéru OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Počet položiek pre synchronizáciu pomocou automatickej OCSNG akcie"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "Ak sa počítač vymaže z OCSNG"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Zmeniť na stav %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Databáza"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Štandardná (povolené manuálne akcie)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Expert(plne automatický, pre veľké konfigurácie)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Metóda synchronizácie"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Spojenie s databázou"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Spojenie s databázou zlyhalo"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Neplatná verzia OCSNG: vyžadovaná verzia je RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "Neplatná OCSNG konfigurácia (TRACE_DELETED musí byť aktívne)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Spojenie s databázou úspešné"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Platná OCSNG konfigurácia a verzia"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Nieje možné pridať. OCSNG server už existuje."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Existuje v GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Existuje v OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Žiadna položka na vyčistenie"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Žiaden počítač na aktualizáciu"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Počítače aktualizované v OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Synchronizovať"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Aktualizovať počítače"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Upozornenie! Importované dáta (pozrite si svoju konfiguráciu) prepíšu existujúce"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Mód ručného importu"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Najskôr skontrolujte, či sú duplikáty korektne ošetrené v OCSNG"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Importovať"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Cieľové umiestnenie"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Žiaden nový počítač na import"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "Softvér vymazaný OCSNG synchronizáciou"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Duplicitné počítače"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Počítače, ktorých import bol odmietnutý na základe pravidiel"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
@@ -1493,31 +1510,31 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "Manuálna synchronizácia"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Zobraziť informácie"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1526,11 +1543,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Žiaden kľúč nebol v registri nájdený"
@@ -1545,47 +1562,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1782,93 +1799,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "Softvér vymazaný OCSNG synchronizáciou"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1933,54 +1954,54 @@ msgstr "Vyčistiť procesy"
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/sr_RS.mo b/locales/sr_RS.mo
index 75a3e3f4..4810a740 100644
Binary files a/locales/sr_RS.mo and b/locales/sr_RS.mo differ
diff --git a/locales/sr_RS.po b/locales/sr_RS.po
index c90ad9da..d59bdebc 100644
--- a/locales/sr_RS.po
+++ b/locales/sr_RS.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Serbian (Serbia) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/sr_RS/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,117 +17,121 @@ msgstr ""
"Language: sr_RS\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr ""
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr ""
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr ""
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr ""
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -135,95 +139,95 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -235,14 +239,14 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr ""
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr ""
@@ -250,7 +254,7 @@ msgstr ""
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -262,7 +266,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -275,35 +279,39 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -359,21 +367,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -382,150 +390,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr ""
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr ""
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -563,28 +575,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -627,15 +639,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -653,15 +665,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -669,846 +681,851 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr ""
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr ""
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr ""
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr ""
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr ""
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr ""
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr ""
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr ""
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr ""
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr ""
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr ""
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr ""
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr ""
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr ""
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr ""
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr ""
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr ""
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr ""
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr ""
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr ""
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr ""
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr ""
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr ""
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr ""
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1516,11 +1533,11 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr ""
@@ -1535,47 +1552,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1772,93 +1789,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1923,54 +1944,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo
index e0b54910..a37e05aa 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 a57ecf0b..1aa31ffa 100644
--- a/locales/tr_TR.po
+++ b/locales/tr_TR.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Turkish (Turkey) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/tr_TR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,210 +18,214 @@ msgstr ""
"Language: tr_TR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr "Otomatik işlemlerle alınmamış bilgisayarlar"
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr "Yeniden al"
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr "Birime al"
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr "Bilgisayarı OCSNG üzerinden sil"
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
-msgstr "OCSNG tarafı eşitlensin"
+#: hook.php:1559
+msgid "Launch synchronization"
+msgstr ""
+
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
-#: hook.php:1552
+#: hook.php:1566
msgid "Lock fields"
msgstr "Alanları kilitle"
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr "Alanların kilidini aç"
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr "Ağ kapısı türlerini güncelle"
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr "OCSNG"
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr "GLPI alma tarihi"
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Son OCSNG envanter tarihi"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr "Otomatik OCSNG güncellemesi"
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr "Envanter ajanı"
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr "OCSNG ETİKETİ"
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr "OCSNG KODU"
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr "Son OCSNG bağlantısı tarihi"
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr "IP Kaynağı"
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr "Çalışma süresi"
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Kayıt Defteri"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Anahtar/Değer"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG adı"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] "OCSNG sunucusu"
msgstr[1] "OCSNG sunucusu"
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr "Vekil sunucu etkin"
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr "Vekil sunucu adresi"
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr "Hizmet adı"
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr "İşlem adı"
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr "SNMP Alma"
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] "OCSNG bağlantısı"
msgstr[1] "OCSNG bağlantısı"
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr "Bağlantı yapılabilir"
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr "Alma işlemi reddedildi"
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr "GLPI içinde yeni bilgisayar oluşturuldu"
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr "Bilgisayarlarla bağlantı"
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] "Kilitli alan"
msgstr[1] "Kilitli alan"
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr "kilit kullanılamaz - Etkinleştirmek için ayarlar bölümüne bakın"
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr "Başlangıç tarihi alanı ocsinventoryng tarafından kilitlenmiş. Lütfen güncellemeden önce kilidini açın."
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr "Otomatik eşitleme ayarları"
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr "Lütfen uygulama ekini etkinleştirin"
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr "Bilgisayar silindi"
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr "Silinecek yeni bir bilgisayar yok"
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr "OCSNG üzerinden silinmiş bilgisayarları temizle"
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr "Otomatik işlemlerle alınmış bilgisayarlar"
@@ -232,14 +236,14 @@ msgid_plural "Unknown imported network ports types"
msgstr[0] "Alınmış bilinmeyen ağ kapısı türü"
msgstr[1] "Alınmış bilinmeyen ağ kapısı türü"
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "GLPI ve OCSNG arasındaki bağlantıları temizle"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Alınmasın: Uygulama eki bu bileşenleri almayacak"
@@ -247,7 +251,7 @@ msgstr "Alınmasın: Uygulama eki bu bileşenleri almayacak"
msgid "Successful link"
msgstr "Başarılı bağlantısı"
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr "Eşitlenmesin: Uygulama eki bu bileşenleri eşitleeyecek"
@@ -259,7 +263,7 @@ msgstr "Betikle ilgili bilgiler"
msgid "Processes execution of automatic actions"
msgstr "Otomatik işlemleri yürütür"
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr "OCSNG alma betiğini sına"
@@ -272,34 +276,38 @@ msgid "Authorize the OCSNG update"
msgstr "OCSNG güncellemesini onaylayın"
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr "Bir işlemin bilgileri şu kadar zamanda bir yenilensin"
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] "saniye"
msgstr[1] "saniye"
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr "Kilitlenmemiş"
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr "Kilitlenmiş"
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr "Kilitle"
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr "Kilidi aç"
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr "Tüm sunucular"
@@ -354,21 +362,21 @@ msgstr "İş parçacığı"
msgid "Rules checked"
msgstr "Denetlenen kural"
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr "Alınan bilgisayar"
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr "Bağlanan bilgisayar"
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr "Güncellenmeyen bilgisayar"
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr "Eşitlenen bilgisayar"
@@ -377,150 +385,154 @@ msgstr "Eşitlenen bilgisayar"
msgid "Computers not unique"
msgstr "Eşsiz olmayan bilgisayar"
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr "Değiştir"
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr "IPDiscover Alma"
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "OCSNG sunucusu seçimi"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr "Açılan kutuda OCSNG sunucunuz görüntülenmiyorsa lütfen proilinizin erişim ayarlarını denetleyin ! "
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr "IPDiscover Alınsın"
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr "IPDiscover Bağlantısı"
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr "Tüm Alt Ağlar"
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr "Bilinen Alt Ağlar"
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr "Bilinmeyen Alt Ağlar"
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr "Envantere Eklenmemiş"
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr "Envantere Eklenmiş"
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr "Belirlenmiş"
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr "Alınmış / Bağlanmış"
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr "Alt Ağı Değiştir"
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr "Alt Ağ Adı"
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr "Kodu Seçin"
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr "Aynı MAC adresine sahip başka bir nesne bulunduğundan eklenemedi."
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr "Alınabilecek yeni bir IPDiscover aygıtı bulunamadı"
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr "Bağlantıyı sil"
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "GLPI üzerine tarih alınsın"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr "Bağlantı"
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr "OCSNG üzerinden sil"
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr "DNS"
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr "OCS Türü"
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr "GLPI Türü"
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr "Bağlanacak öge"
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr "OCSNG sunucusunun ayarları"
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Yeni bilgisayarlar alınsın"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Önceden alınmış bilgisayarlar eşitlensin"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr "Yeni OCSNG bilgisayarları varolan GLPI bilgisayarlarıyla bağlansın"
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr "Otomatik işlemlerin betik yürütmesi"
@@ -558,28 +570,28 @@ msgstr "Bir OCSNG sunucusu ayarlamalısınız"
msgid "Add a OCSNG server"
msgstr "Bir OCSNG sunucusu ekleyin"
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr "OCS TÜRÜ"
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr "OCS MIB TÜRÜ"
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr "Bu türü tanımlayan bir kayıt oluşturun"
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr "Bir harita ekleyin"
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr "boş"
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr "OCS tarafından bilinmeyen ağ kapısı türü yok !"
@@ -621,15 +633,15 @@ msgstr "Bilinmeyen kapılar şuna göre dönüştürülsün"
msgid "Create"
msgstr "Ekle"
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr "Ağ paylaşımları"
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr "Yol"
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr "Kota"
@@ -647,15 +659,15 @@ msgstr "Bileşenler kural ile eşleşmiyor"
msgid "Elements not match with the rule by automatic actions"
msgstr "Bileşenler otomatik işlemler kuralı ile eşleşmiyor"
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr "varlık ve konumlar için atama kuralları doğrulaması"
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr "Eşleşen bir kural yok"
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr "Veri hatası"
@@ -663,856 +675,861 @@ msgstr "Veri hatası"
msgid "Verified rules"
msgstr "Doğrulanan kural"
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr "Bir birimi etkilemez"
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr "Unicity ölçütü doğrulanmadı"
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr "Bir kural nedeniyle alma reddedildi"
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr "Bilgisayar üzerinde yapılacak işlemler"
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr "OCSNG alınmayan bilgisayar uyarısı gönderilemedi"
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr "Alınmayan bilgisayarlar uyarısı"
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr "OCS Inventory NG alma bilgileri"
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr "OCSNG Arayüzü"
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
-msgstr "Zorla Eşitlensin"
+msgid "Force full import"
+msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr "OCS Inventory NG SNMP alma ayarları"
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr "Alınmış nesne"
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr "Bağlantılı nesne"
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr "SNMP eşitlemesi zorlansın"
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr "Son OCSNG SNMP envanter tarihi"
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr "OCS Inventory NG IPDiscover Alma Bilgileri"
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr "OCSNG AYGIT KODU"
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr "OCSNG veritabanında herhangi bir bilgisayar bulunamadı"
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr "Sağlama sınaması"
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr "OCSNG üzerinden alındı"
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "OCSNG üzerinde silindi"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Bir OCSNG bilgisayarı ile bağlı"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr "Bilgisayarın %1$s olan OCSNG kodu %2$s olarak değiştirildi"
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr "Bilgisayarın %1$s olan OCSNG etiketi %2$s olarak değiştirildi"
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr "Seri numarası (%d) kara listeye alınmış olduğundan, bu bilgisayar ile bağlantı kurulamadı"
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr "UUID (%d) kara listeye alınmış olduğundan, bu bilgisayar ile bağlantı kurulamadı"
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr "Alınamıyor, GLPI bilgisayarı zaten bir OCSNG bileşeni ile ilişkilendirilmiş (%d)"
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr "Bilgisayarların herhangi bir kurala uygunluğu aranmıyor"
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Çift kaydedilmiş bilgisayarlar"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Bir kurala uymadığı için alınmayan bilgisayarlar"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr "SNMP nesneleri alındı"
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr "SNMP nesneleri eşitlendi"
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr "SNMP nesneleri bağlandı"
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr "SNMP nesneleri güncellenemedi"
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr "SNMP nesneleri alınamadı"
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr "IPDISCOVER nesnesi alındı"
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr "IPDISCOVER nesnesi eşitlendi"
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr "IPDISCOVER nesnesi güncellenmedi"
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr "IPDISCOVER alınmadı"
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr "OCSN SNMP alma istatistikleri"
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr "IPDISCOVER alma istatistikleri"
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr "OCSNG bağlantı istatistikleri"
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr "Alınacak veriler"
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Ayarları al"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr "Genel geçmiş"
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr "OCSNG konsolu"
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr "Uzman eşitleme kipi"
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr "Veritabanı UTF8"
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr "%s OCSNG sunucusunun ayarları"
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr "Kural motoru ayarları"
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr "Ögeler alınırken varlığın seçimi kural ayarları"
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr "Öge bağlantısı için seçim ölçütü kural ayarları"
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr "Ayarlara Bakın: Önce verileri alın"
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr "Seçilmiş sunucu etkin olmadığından, alma ve eşitleme yapılamaz"
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Genel bilgiler"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr "Uyarı: alma varlık kuralları seçilmiş alanlara bağlı"
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr "Bios alımına bağlı"
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr "Kullanıcı bilgileri"
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr "Kullanıcı bilgileri kişiden etkilensin"
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr "Kişi içe aktarmaya bağlı olarak"
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr "Varsayılan olarak kullanıcı konumu etkllensin"
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr "Varsayılan olarak ilk kullanıcı grubu etkilensin"
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr "OCS Unventory NG 7006 sürümünden sonra"
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr "OCS Unventory NG 7009 sürümünden sonra ve Bios alımına bağlı"
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr "Bağlantılı nesneler"
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Toplu alma"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Birim alma"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Seri numarasına göre birim alma"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr "Yalnız seri numarasına göre birim alma"
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr "Genel alma: Her şey alınır ancak malzeme tek noktadan yönetilir (kopyalanmaz)"
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr "Birim alma: Herşey olduğu gibi alınır"
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr "OCS Inventory NG uygulama ekleri"
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr "Microsoft Office lisansları"
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr "OCSNG için yazılım alma ve OfficePack Uygulama eki (https://github.com/PluginsOCSInventory-NG/officepack) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr "Antivirus"
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr "OCSNG için Güvenlik Uygulama Eki (https://github.com/PluginsOCSInventory-NG/security) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr "OCSNG için Uptime Uygulama Eki (https://github.com/PluginsOCSInventory-NG/uptime) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr "Windows Güncelleme Durumu"
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr "OCSNG için Winupdate Uygulama Eki (https://github.com/PluginsOCSInventory-NG/winupdate) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr "Teamviewer"
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr "OCSNG için Teamviewer Uygulama Eki (https://github.com/PluginsOCSInventory-NG/teamviewer) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr "Vekil Sunucu Ayarları"
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr "OCSNG için Navigator Vekil Sunucu Ayarları Uygulama Eki (https://github.com/PluginsOCSInventory-NG/navigatorproxysetting) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr "Windows Kullanıcıları"
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr "OCSNG için Winusers Uygulama Eki (https://github.com/PluginsOCSInventory-NG/winusers) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr "OS bilgileri"
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr "OCSNG için OSInstall Uygulama Eki (https://github.com/PluginsOCSInventory-NG/osinstall) kurulmuş olmalıdır"
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr "OCSNG için Networkshare uygulama eki (https://github.com/PluginsOCSInventory-NG/networkshare) kurulmuş olmalıdır"
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr "Hizmet"
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr "OCSNG için Hizmet Uygulama Eki (https://github.com/PluginsOCSInventory-NG/services) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr "Çalışan İşlemler"
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr "OCSNG için Çalışan İşlemler Uygulama Eki (https://github.com/PluginsOCSInventory-NG/runningProcess) yüklenmiş olmalıdır"
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG yönetim bilgileri"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr "Do geçmişi"
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr "Sistem Geçmişi"
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr "Bios geçmişi"
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr "Aygıt geçmişi"
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr "Birim geçmişi"
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr "Ağ geçmişi"
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr "Ekran bağlanma geçmişi"
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr "Yazıcı bağlanma geçmişi"
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr "Çevre birimi bağlanma geçmişi"
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr "Yazılım bağlanma geçmişi"
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr "Sanal makinalar geçmişi"
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr "Yönetimsel bilgiler geçmişi"
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
-msgstr ""
+msgstr "Uygulama eki geçmişi"
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "OCSNG konsolunun web adresi"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Yalnız şu etiketler alınsın (ayıraç $, tümü için boş bırakın)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Şu etiketler alınmasın (ayıraç $, tümü için boş bırakın)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Varsayılan durum"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr "Bağlantı kesilme davranışı"
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr "Bağlantıyı koru"
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr "Bağlantıyı çöpe at ve kilitle"
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr "Bağlantıyı kalıcı olarak sil"
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr "Bilgisayar bağlantısı kesildiğinde bağlantı üzerindeki diğer nesnelere uygulanacak işlemi seçin"
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "OCSNG yazılım sözlüğü kullanılsın"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr "OCSNG yazılım sözlüğü kullanılsın seçeneği etkinleştirilmiş ise OCS içine kurulmayan yazılımlar alınmaz"
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Otomatik OCSNG işlemiyle eşitlenecek öge sayısı"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr "OCSNG otomatik görevi yalnız sunucu uzman kipinde olmadığında yürütülür"
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr "OCSNG otomatik görevi yalnız yeni bilgisayarlar almıyorsa varolan bilgisayarları eşitleyebilir"
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr "Yeni bilgisayarlar almak istiyorsanız bu seçeneği devre dışı bırakın, uzman kipine geçin ve sistem betiğini kullanın"
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr "OCSNG tarafında bir bilgisayarı silme davranışı"
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Durumu %s olarak değiştirilsin"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr "Veritabanı"
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr "Standard (el ile işlem yapılabilir)"
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr "Uzman (Tam otomatik, geniş ayarlar için)"
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr "Bağlantı türü"
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr "Sağlamayı Yeniden Yükle"
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr "Sunucu"
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr "http://127.0.0.1 for SOAP yöntemi gibi"
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr "Eşitleme yöntemi"
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr "Eski ajanları temizleyerek OCSNG üzerinden silmek için otomatik işlem kullanılsın"
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr "Silinmiş bilgisayar için otomatik geri yükleme işlemi kullanılsın"
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr "Son envanter tarihinden sonra bilgisayarların geri yükleneceği gün sayısı"
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr "Varlık atama kurallarını denetlemek için otomatik işlem kullanılsın"
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr "Varlık ve konum atama kurallarına artık yanıt vermeyen aygıtlar için otomatik işlem kullanılsın ve bir bildirim gönderilsin"
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr "Otomatik kilitler kullanılsın"
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr "Bilgisayarları OCSNG üzerinden sil"
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr "Bilgisayarları sil"
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr "Veritabanına bağlanılıyor"
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr "Veritabanına bağlanılamadı"
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "OCSNG Sürümü Geçersiz: RC3 gerekli"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr "OCSNG ayarları geçersiz (TRACE_DELETED etkinleştirilmiş olmalı)"
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr "Veritabanına bağlanıldı"
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Geçerli OCSNG ayarları ve sürümü"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr "Eklenemiyor. OCSNG sunucusu zaten var."
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr "Seri numarası (%d) kara listeye alınmış olduğundan, bu bilgisayar ile bağlantı kurulamadı"
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr "UUID (%d) kara listeye alınmış olduğundan, bu bilgisayar ile bağlantı kurulamadı"
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr "Alınamıyor, GLPI bilgisayarı zaten bir OCSNG bileşeni ile ilişkilendirilmiş (%d)"
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr "Değiştir"
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "GLPI içinde var"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "OCSNG içinde var"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "Temizlenecek bir öge yok"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Güncellenecek yeni bir bilgisayar bulunamadı"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "OCSNG üzerinde güncellenmiş bilgisayarlar"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Eşitle"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Bilgisayarları güncelle"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr "Dikkat! Alınmış veri (ayarlarınıza bakın) varolan verinin üzerine yazılacak"
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "El ile aktarım kipi"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr "Önizlemeyi devre dışı bırak"
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Önizlemeyi etkinleştir"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "Önce, OCSNG de çift kayıt olup olmadığını denetleyin"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Al"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Kurala uyulsun mu?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "Hedef konum"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr "Kara listeye alınmış seri numarası"
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr "Kara listeye alınmış UUID"
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr "Kara listeye alınmış MAC"
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr "Kara listeye alınmış IP"
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr "Uyarı ! Bu bilgisayar başka bir OCS bilgisayarı ile zaten bağlanmış"
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Alınacak yeni bir bilgisayar bulunamadı"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
-msgstr "Yazılım OCSNG eşitlemesi tarafından silindi"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr "Bilgisayarları OCSNG üzerinden sil"
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
+msgstr "Bilgisayarları sil"
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr "OCSNG eşitleme betiğini çalıştır"
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr "Eski ajanları temizleyerek OCSNG üzerinden sil"
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr "Son envanter tarihinden sonraki bilgisayarları geri yükle"
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr "Eski ajanlar temizlendi"
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr "Eski ajanlar temizlenemedi"
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr "Bilgisayarlar silindi"
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr "Bilgisayarlar silinemedi"
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr "Bilgisayarlar geri yüklendi"
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr "Bilgisayarlar geri yüklenemedi"
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr "OCSNG eşitleme betiğini sunucudan çalıştır"
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr "Bilgisayarların herhangi bir kurala uygunluğu aranmıyor"
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Çift kaydedilmiş bilgisayarlar"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Bir kurala uymadığı için alınmayan bilgisayarlar"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr "SNMP nesneleri alındı"
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr "SNMP nesneleri eşitlendi"
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr "SNMP nesneleri bağlandı"
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr "SNMP nesneleri güncellenemedi"
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr "SNMP nesneleri alınamadı"
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr "IPDISCOVER nesnesi alındı"
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr "IPDISCOVER nesnesi eşitlendi"
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr "IPDISCOVER nesnesi güncellenmedi"
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr "IPDISCOVER alınmadı"
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr "OCSN SNMP alma istatistikleri"
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr "IPDISCOVER alma istatistikleri"
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr "OCSNG bağlantı istatistikleri"
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr "Yapım sürümü"
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr "Kurulum tarihi"
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr "Kod kümesi"
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr "Ülke kodu"
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr "OS Dili"
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr "Geçerli Saat Dilimi"
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr "Yerel"
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] "İzin verilen OCSNG sunucuları"
msgstr[1] "İzin verilen OCSNG sunucuları"
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr "El ile eşitleme"
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr "Bilgilere bakın"
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr "Bilgisayarı içe aktar"
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr "Bilgisayarı bağla"
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr "Otomatik Yapılandırma Adresi"
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr "Vekil sunucu istisnaları"
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] "%d kayıt anahtarı bulundu"
msgstr[1] "%d kayıt anahtarı bulundu"
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr "Kovan"
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Kayıt defteri anahtarı bulunamadı"
@@ -1527,47 +1544,47 @@ msgstr "Bir ögeyi bir varlığa atayan kurallara artık yanıt vermeyen bilgisa
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr "%s varlığına yerleştirme kurallarına uymayan ögeler: %s"
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr "İşlem Kodu"
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr "İşlem belleği"
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr "Komut satırı"
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr "Kurum"
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr "Tam ad"
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr "Hizmet Durumu"
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr "Başlatma türü"
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr "Erişim yolu"
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr "Oturum"
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr "Çıkış kodu"
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr "Belirtilen çıkış kodu"
@@ -1764,93 +1781,97 @@ msgid "See Setup : SNMP Import before"
msgstr "Ayarlara Bakın: Önce SNMP alma"
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr "Yeni SNMP aygıtları alınsın"
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr "Kartuş bilgileri"
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr "Tepsi bilgileri"
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr "Yazıcı Belleği"
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr "Bilgisayar Belleği"
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr "SNMP nesne listesini süz"
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr "Öge türüne göre"
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr "IP adresine göre"
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr "Yeni SNMP aygıtları GLPI üzerine alınsın"
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr "SNMP İlgili"
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr "SNMP Konum"
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr "SNMP Türü"
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr "Eklenecek öge türü"
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr "Alınacak yeni bir SNMP aygıtı bulunamadı"
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr "Güncellenecek yeni bir SNMP aygıtı bulunamadı"
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr "SNMP aygıtı OCSNG üzerinde güncellendi"
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr "GLPI Nesnesi"
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr "OCS SNMP aygıtı"
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr "SNMP aygıtını güncelle"
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr "Yazılım OCSNG eşitlemesi tarafından silindi"
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr "Teamviewer erişimi"
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr "Teamviewer Kimliği"
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr "Doğrudan Teamviewer erişimi"
@@ -1915,54 +1936,54 @@ msgstr "İşlemleri temizle"
msgid "Delete processes after"
msgstr "İşlemler şundan sonra silinsin"
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr "Windows Güncellemeleri"
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr "Otomatik Güncelleme Ayarları"
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr "Yükleme Tarihi Zamanla"
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr "Son Yükleme Zamanı"
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr "Son Algılama Zamanı"
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr "Son İndirme Zamanı"
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr "Otomatik Güncellemeler zorunludur ve kullanıcılar ayarlayabilir"
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr "Otomatik olarak indir ve yüklemeyi zamanla"
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr "Otomatik olarak indir ve yüklemeyi bildir"
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr "İndirmeden önce bildir"
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr "Otomatik Güncelleme Kullanılmasın"
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr "Devre Dışı"
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr "SID"
diff --git a/locales/uk_UA.mo b/locales/uk_UA.mo
index c807d111..501344e0 100644
Binary files a/locales/uk_UA.mo and b/locales/uk_UA.mo differ
diff --git a/locales/uk_UA.po b/locales/uk_UA.po
index f5c001de..76ca0dfe 100644
--- a/locales/uk_UA.po
+++ b/locales/uk_UA.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/uk_UA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,117 +17,121 @@ msgstr ""
"Language: uk_UA\n"
"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "Дата останнього оновлення в OCSNG"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "Реєстр"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "Ключ/значення"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG ім’я"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
@@ -136,29 +140,29 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
@@ -166,23 +170,23 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
@@ -190,43 +194,43 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -239,14 +243,14 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "Очистити зв’язки між GLPI і OCSNG"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "Немає імпорту: модуль не буде імпортувати ці елементи"
@@ -254,7 +258,7 @@ msgstr "Немає імпорту: модуль не буде імпортува
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -266,7 +270,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -279,10 +283,14 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
@@ -290,25 +298,25 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -365,21 +373,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -388,150 +396,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "Вибір сервера OCSNG"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "Дата імпортування в систему GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "Імпортування нових комп’ютерів"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "Синхронізовані комп’ютери вже імпортовані"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -569,28 +581,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -634,15 +646,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -660,15 +672,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -676,815 +688,820 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "Видалено в OCSNG"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "Пов’язаний з комп’ютером OCSNG"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "Дублікати комп’ютерів"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "Комп’ютери, імпорт яких заборонено правилами"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "Опції імпорту"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "Загальна інформація про комп’ютер"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "Глобальний імпорт"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "Імпорт об’єкту"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "Імпорт об’єкту за серійним номером"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "Адміністративна інформація OCSNG"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "Веб адреса консолі OCSNG"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "Обмежити імпорт до наступних тегів (розділювач $, пусто для всіх)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "Виключити наступні теги (розділювач $, пусто для всіх)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "Статус за замовчуванням"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "Використовувати словник ПЗ із OCSNG"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "Кількість елементів для синхронізації використовуючи автоматичну дію OCSNG"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "Зміна статусу %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "Невірна версія OCSNG: потрібно RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "Правильна конфігурація і версія OCSNG"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "Існують в GLPI"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "Існують в OCSNG"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr ""
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "Немає нових комп’ютерів для оновлення"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "Комп’ютери оновлені в системі OCSNG"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "Синхронізувати"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "Оновити комп’ютери"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "Режим ручного імпорту"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "Активувати попередній перегляд"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "Імпорт"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "Відповідає правилу?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr ""
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "Немає нових комп’ютерів для імпорту"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "Дублікати комп’ютерів"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "Комп’ютери, імпорт яких заборонено правилами"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
@@ -1492,31 +1509,31 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
@@ -1525,11 +1542,11 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "Немає даних в журналі записів"
@@ -1544,47 +1561,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1781,93 +1798,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1932,54 +1953,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo
index ba4660df..878a471b 100644
Binary files a/locales/zh_CN.mo and b/locales/zh_CN.mo differ
diff --git a/locales/zh_CN.po b/locales/zh_CN.po
index 5dfba823..ee888231 100644
--- a/locales/zh_CN.po
+++ b/locales/zh_CN.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: GLPI Project - ocsinventoryng plugin\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-17 14:59+0200\n"
-"PO-Revision-Date: 2018-07-17 13:00+0000\n"
-"Last-Translator: Amandine Manceau\n"
+"POT-Creation-Date: 2018-08-11 15:13+0200\n"
+"PO-Revision-Date: 2018-08-11 13:15+0000\n"
+"Last-Translator: Xavier CAILLAUD \n"
"Language-Team: Chinese (China) (http://www.transifex.com/yllen/GLPI_ocsinventoryng/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,207 +18,211 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: hook.php:1439 front/notimportedcomputer.php:34 inc/menu.class.php:93
+#: hook.php:1449 front/notimportedcomputer.php:34 inc/menu.class.php:93
#: inc/notificationtargetnotimportedcomputer.class.php:43
#: inc/notificationtargetnotimportedcomputer.class.php:94
-#: inc/ocsserver.class.php:549 inc/ocsserver.class.php:550
-#: inc/ocsserver.class.php:551 inc/thread.class.php:117
+#: inc/ocsserver.class.php:500 inc/ocsserver.class.php:501
+#: inc/ocsserver.class.php:502 inc/thread.class.php:117
#: inc/thread.class.php:320
msgid "Computers not imported by automatic actions"
msgstr ""
-#: hook.php:1529
+#: hook.php:1539
msgid "Restart import"
msgstr ""
-#: hook.php:1531
+#: hook.php:1541
msgid "Import in the entity"
msgstr ""
-#: hook.php:1537
+#: hook.php:1547
msgid "Delete computer in OCSNG"
msgstr ""
-#: hook.php:1549
-msgid "Force synchronization OCSNG"
+#: hook.php:1559
+msgid "Launch synchronization"
msgstr ""
-#: hook.php:1552
+#: hook.php:1563
+msgid "Force full import"
+msgstr ""
+
+#: hook.php:1566
msgid "Lock fields"
msgstr ""
-#: hook.php:1555
+#: hook.php:1569
msgid "Unlock fields"
msgstr ""
-#: hook.php:1565
+#: hook.php:1579
msgid "Update networkport types"
msgstr ""
-#: hook.php:1590 hook.php:1597 hook.php:1605 hook.php:1611 hook.php:1617
-#: hook.php:1624 hook.php:1631 hook.php:1638 hook.php:1645 hook.php:1654
-#: hook.php:1663 hook.php:1672 hook.php:1682 hook.php:1690 hook.php:1697
-#: hook.php:1704 hook.php:1715 inc/notimportedcomputer.class.php:671
-#: inc/ocslink.class.php:406 inc/ocsserver.class.php:7009
-#: inc/ocsserver.class.php:7013 inc/ocsserver.class.php:7017
-#: inc/profile.class.php:54 inc/ruleimportentity.class.php:61
-#: inc/thread.class.php:596
+#: hook.php:1604 hook.php:1611 hook.php:1619 hook.php:1625 hook.php:1631
+#: hook.php:1638 hook.php:1645 hook.php:1652 hook.php:1659 hook.php:1666
+#: hook.php:1675 hook.php:1684 hook.php:1693 hook.php:1703 hook.php:1711
+#: hook.php:1718 hook.php:1725 hook.php:1736
+#: inc/notimportedcomputer.class.php:676 inc/ocslink.class.php:431
+#: inc/ocsserver.class.php:2767 inc/ocsserver.class.php:2771
+#: inc/ocsserver.class.php:2775 inc/profile.class.php:54
+#: inc/ruleimportentity.class.php:61 inc/thread.class.php:596
msgid "OCSNG"
msgstr ""
-#: hook.php:1590 hook.php:1715 inc/ocslink.class.php:107
+#: hook.php:1604 hook.php:1736 inc/ocslink.class.php:115
msgid "GLPI import date"
msgstr ""
-#: hook.php:1597 inc/ipdiscoverocslink.class.php:1265
+#: hook.php:1611 inc/ipdiscoverocslink.class.php:1268
#: inc/notimportedcomputer.class.php:91 inc/notimportedcomputer.class.php:304
-#: inc/ocslink.class.php:102 inc/ocsserver.class.php:4076
+#: inc/ocslink.class.php:110 inc/ocsserver.class.php:2172
msgid "Last OCSNG inventory date"
msgstr "上次OCSNG扫描日期"
-#: hook.php:1605 inc/ocslink.class.php:142 inc/ocslink.class.php:348
+#: hook.php:1619 inc/ocslink.class.php:150 inc/ocslink.class.php:370
msgid "Automatic update OCSNG"
msgstr ""
-#: hook.php:1611 inc/notimportedcomputer.class.php:82
-#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:104
+#: hook.php:1625 inc/notimportedcomputer.class.php:82
+#: inc/notimportedcomputer.class.php:259 inc/ocslink.class.php:112
msgid "Inventory agent"
msgstr ""
-#: hook.php:1617 hook.php:1880 hook.php:1933
+#: hook.php:1631 hook.php:1913 hook.php:1966
#: inc/notificationtargetnotimportedcomputer.class.php:92
#: inc/notimportedcomputer.class.php:79 inc/notimportedcomputer.class.php:283
-#: inc/ocslink.class.php:134 inc/ocslink.class.php:341
-#: inc/ocsserver.class.php:4077 inc/ocsserver.class.php:4491
+#: inc/ocslink.class.php:142 inc/ocslink.class.php:363
+#: inc/ocsserver.class.php:2173 inc/ocsserver.class.php:2444
msgid "OCSNG TAG"
msgstr ""
-#: hook.php:1624 inc/detail.class.php:54
+#: hook.php:1638 inc/detail.class.php:54
#: inc/notificationtargetnotimportedcomputer.class.php:96
#: inc/notimportedcomputer.class.php:66 inc/notimportedcomputer.class.php:241
msgid "OCSNG ID"
msgstr ""
-#: hook.php:1631 inc/ocslink.class.php:120
+#: hook.php:1645 inc/ocslink.class.php:128
msgid "Last OCSNG connection date"
msgstr ""
-#: hook.php:1638 inc/ocslink.class.php:127
+#: hook.php:1652 inc/ocslink.class.php:135
msgid "IP Source"
msgstr ""
-#: hook.php:1645 inc/ocslink.class.php:155 inc/ocslink.class.php:242
-#: inc/ocslink.class.php:355 inc/ocsserver.class.php:910
-#: inc/snmpocslink.class.php:516 inc/snmpocslink.class.php:697
+#: hook.php:1659 inc/ocslink.class.php:163 inc/ocslink.class.php:262
+#: inc/ocslink.class.php:377 inc/ocsserver.class.php:861
+#: inc/snmpocslink.class.php:517 inc/snmpocslink.class.php:699
msgid "Uptime"
msgstr ""
-#: hook.php:1654 hook.php:1663 inc/ocsserver.class.php:865
-#: inc/registrykey.class.php:48 inc/registrykey.class.php:116
+#: hook.php:1675 hook.php:1684 inc/ocsserver.class.php:816
+#: inc/registrykey.class.php:48 inc/registrykey.class.php:159
msgid "Registry"
msgstr "登录库"
-#: hook.php:1655 inc/registrykey.class.php:100
+#: hook.php:1676 inc/registrykey.class.php:143
msgid "Key/Value"
msgstr "键/计算结果"
-#: hook.php:1664 inc/notimportedcomputer.class.php:249
+#: hook.php:1685 inc/notimportedcomputer.class.php:249
msgid "OCSNG name"
msgstr "OCSNG名"
-#: hook.php:1672 hook.php:1890 hook.php:1926 inc/config.class.php:113
-#: inc/ocsserver.class.php:117 inc/ocsserver.class.php:350
-#: inc/ocsserver.class.php:461 inc/profile.class.php:256
+#: hook.php:1693 hook.php:1923 hook.php:1959 inc/config.class.php:113
+#: inc/ocsserver.class.php:64 inc/ocsserver.class.php:299
+#: inc/ocsserver.class.php:412 inc/profile.class.php:257
#: inc/thread.class.php:43
msgid "OCSNG server"
msgid_plural "OCSNG servers"
msgstr[0] ""
-#: hook.php:1682 inc/proxysetting.class.php:127
+#: hook.php:1703 inc/proxysetting.class.php:191
msgid "Proxy enabled"
msgstr ""
-#: hook.php:1690 inc/proxysetting.class.php:129
+#: hook.php:1711 inc/proxysetting.class.php:193
msgid "Proxy address"
msgstr ""
-#: hook.php:1697 inc/service.class.php:121
+#: hook.php:1718 inc/service.class.php:175
msgid "Name of the service"
msgstr ""
-#: hook.php:1704 inc/runningprocess.class.php:125
+#: hook.php:1725 inc/runningprocess.class.php:178
msgid "Process name"
msgstr ""
-#: hook.php:1715 inc/menu.class.php:184 inc/snmpocslink.class.php:73
+#: hook.php:1736 inc/menu.class.php:184 inc/snmpocslink.class.php:73
msgid "SNMP Import"
msgstr ""
-#: hook.php:1968 inc/ocslink.class.php:51 inc/ocslink.class.php:330
-#: inc/ocslink.class.php:470 inc/ocslink.class.php:483
-#: inc/ocslink.class.php:496 inc/ocslink.class.php:699
+#: hook.php:2001 inc/ocslink.class.php:51 inc/ocslink.class.php:352
+#: inc/ocslink.class.php:495 inc/ocslink.class.php:508
+#: inc/ocslink.class.php:521 inc/ocslink.class.php:741
msgid "OCSNG link"
msgid_plural "OCSNG links"
msgstr[0] ""
-#: hook.php:2148
+#: hook.php:2181
msgid "Link possible"
msgstr ""
-#: hook.php:2152
+#: hook.php:2185
msgid "Import refused"
msgstr ""
-#: hook.php:2156
+#: hook.php:2189
msgid "New computer created in GLPI"
msgstr ""
-#: hook.php:2168
+#: hook.php:2201
msgid "Link with computer"
msgstr ""
-#: hook.php:2392
+#: hook.php:2428
msgid "Locked field"
msgid_plural "Locked fields"
msgstr[0] ""
-#: hook.php:2405
+#: hook.php:2441
msgid "You don't use locks - See setup for activate them"
msgstr ""
-#: hook.php:2631
+#: hook.php:2670
msgid ""
"The startup date field is locked by ocsinventoryng please unlock it before "
"update."
msgstr ""
-#: front/config.form.php:49 inc/config.class.php:47 inc/config.class.php:119
-#: inc/ocsserver.class.php:367 inc/ocsserver.class.php:368
-#: inc/ocsserver.class.php:369
+#: front/config.form.php:51 inc/config.class.php:47 inc/config.class.php:119
+#: inc/ocsserver.class.php:316 inc/ocsserver.class.php:317
+#: inc/ocsserver.class.php:318
msgid "Automatic synchronization's configuration"
msgstr ""
-#: front/config.form.php:56 front/config.php:46
+#: front/config.form.php:58 front/config.php:48
msgid "Please activate the plugin"
msgstr ""
-#: front/deleted_equiv.php:41 front/deleted_equiv.php:51
-#: front/deleted_equiv.php:86
+#: front/deleted_equiv.php:43 front/deleted_equiv.php:53
+#: front/deleted_equiv.php:88
msgid "Pc deleted"
msgstr ""
-#: front/deleted_equiv.php:45 front/deleted_equiv.php:76
+#: front/deleted_equiv.php:47 front/deleted_equiv.php:78
msgid "No new computers to delete"
msgstr ""
-#: front/deleted_equiv.php:49 front/deleted_equiv.php:84
-#: inc/menu.class.php:104 inc/ocsserver.class.php:570
-#: inc/ocsserver.class.php:571 inc/ocsserver.class.php:572
+#: front/deleted_equiv.php:51 front/deleted_equiv.php:86
+#: inc/menu.class.php:104 inc/ocsserver.class.php:521
+#: inc/ocsserver.class.php:522 inc/ocsserver.class.php:523
msgid "Clean OCSNG deleted computers"
msgstr ""
-#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:520
-#: inc/ocsserver.class.php:521 inc/ocsserver.class.php:522
+#: front/detail.php:34 inc/menu.class.php:89 inc/ocsserver.class.php:471
+#: inc/ocsserver.class.php:472 inc/ocsserver.class.php:473
#: inc/thread.class.php:114 inc/thread.class.php:317
msgid "Computers imported by automatic actions"
msgstr ""
@@ -228,14 +232,14 @@ msgid "Unknown imported network port type"
msgid_plural "Unknown imported network ports types"
msgstr[0] ""
-#: front/ocsng.clean.php:53 inc/menu.class.php:108 inc/ocsserver.class.php:578
-#: inc/ocsserver.class.php:579 inc/ocsserver.class.php:580
-#: inc/ocsserver.class.php:3809 inc/profile.class.php:268
+#: front/ocsng.clean.php:55 inc/menu.class.php:108 inc/ocsserver.class.php:529
+#: inc/ocsserver.class.php:530 inc/ocsserver.class.php:531
+#: inc/ocsserver.class.php:1955 inc/profile.class.php:269
msgid "Clean links between GLPI and OCSNG"
msgstr "清洁GLPI和OCSNG间的联系"
-#: front/ocsng.import.php:86 front/ocsngsnmp.import.php:86
-#: inc/ocsserver.class.php:882
+#: front/ocsng.import.php:88 front/ocsngsnmp.import.php:86
+#: inc/ocsserver.class.php:833
msgid "No import: the plugin will not import these elements"
msgstr "没有导入:插件将不导入这些元素"
@@ -243,7 +247,7 @@ msgstr "没有导入:插件将不导入这些元素"
msgid "Successful link"
msgstr ""
-#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:63
+#: front/ocsngsnmp.sync.php:79 front/ocsng.sync.php:66
msgid "No synchronization: the plugin will not synchronize these elements"
msgstr ""
@@ -255,7 +259,7 @@ msgstr ""
msgid "Processes execution of automatic actions"
msgstr ""
-#: inc/config.class.php:63 inc/config.class.php:176
+#: inc/config.class.php:63 inc/config.class.php:182
msgid "Check OCSNG import script"
msgstr ""
@@ -268,33 +272,37 @@ msgid "Authorize the OCSNG update"
msgstr ""
#: inc/config.class.php:154
+msgid "Log imported computers"
+msgstr ""
+
+#: inc/config.class.php:160
msgid "Refresh information of a process every"
msgstr ""
-#: inc/config.class.php:156
+#: inc/config.class.php:162
msgid "second"
msgid_plural "seconds"
msgstr[0] ""
-#: inc/config.class.php:182
+#: inc/config.class.php:188
msgid "Lock not activated"
msgstr ""
-#: inc/config.class.php:184
+#: inc/config.class.php:190
msgid "Lock activated"
msgstr ""
-#: inc/config.class.php:190
+#: inc/config.class.php:196
msgctxt "button"
msgid "Lock"
msgstr ""
-#: inc/config.class.php:191
+#: inc/config.class.php:197
msgctxt "button"
msgid "Unlock"
msgstr ""
-#: inc/config.class.php:234 inc/thread.class.php:394
+#: inc/config.class.php:240 inc/thread.class.php:394
msgid "All servers"
msgstr ""
@@ -348,21 +356,21 @@ msgstr ""
msgid "Rules checked"
msgstr ""
-#: inc/detail.class.php:198 inc/ocsserver.class.php:7251
+#: inc/detail.class.php:198 inc/ocsprocess.class.php:1508
msgid "Computers imported"
msgstr ""
-#: inc/detail.class.php:201 inc/ocsserver.class.php:7253
+#: inc/detail.class.php:201 inc/ocsprocess.class.php:1510
#: inc/thread.class.php:116 inc/thread.class.php:319
msgid "Computers linked"
msgstr ""
-#: inc/detail.class.php:204 inc/ocsserver.class.php:7254
+#: inc/detail.class.php:204 inc/ocsprocess.class.php:1511
#: inc/thread.class.php:119 inc/thread.class.php:321
msgid "Computers not updated"
msgstr ""
-#: inc/detail.class.php:207 inc/ocsserver.class.php:7252
+#: inc/detail.class.php:207 inc/ocsprocess.class.php:1509
#: inc/thread.class.php:115 inc/thread.class.php:318
msgid "Computers synchronized"
msgstr ""
@@ -371,150 +379,154 @@ msgstr ""
msgid "Computers not unique"
msgstr ""
+#: inc/hardware.class.php:226 inc/ocsprocess.class.php:377
+msgid "Swap"
+msgstr ""
+
#: inc/ipdiscoverocslink.class.php:48 inc/menu.class.php:125
#: inc/menu.class.php:167
msgid "IPDiscover Import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:346 inc/ocsserver.class.php:304
-#: inc/ocsserver.class.php:418 inc/snmpocslink.class.php:373
+#: inc/ipdiscoverocslink.class.php:347 inc/ocsserver.class.php:253
+#: inc/ocsserver.class.php:369 inc/snmpocslink.class.php:373
msgid "Choice of an OCSNG server"
msgstr "选择一个OCSNG服务器"
-#: inc/ipdiscoverocslink.class.php:369 inc/ocsserver.class.php:326
-#: inc/ocsserver.class.php:438 inc/snmpocslink.class.php:395
+#: inc/ipdiscoverocslink.class.php:370 inc/ocsserver.class.php:275
+#: inc/ocsserver.class.php:389 inc/snmpocslink.class.php:395
msgid ""
"If you not find your OCSNG server in this dropdown, please check if your "
"profile can access it !"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:394
+#: inc/ipdiscoverocslink.class.php:395
msgid "Import IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:397
+#: inc/ipdiscoverocslink.class.php:398
msgid "Link IPDiscover"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:405
+#: inc/ipdiscoverocslink.class.php:406
msgid "All Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:406
+#: inc/ipdiscoverocslink.class.php:407
msgid "Known Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:407
+#: inc/ipdiscoverocslink.class.php:408
msgid "Unknown Subnets"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:673 inc/ipdiscoverocslink.class.php:1230
+#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1233
msgid "Non Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:674 inc/ipdiscoverocslink.class.php:1226
+#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1229
msgid "Inventoried"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:675 inc/ipdiscoverocslink.class.php:1232
+#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1235
msgid "Identified"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:676 inc/ipdiscoverocslink.class.php:1228
+#: inc/ipdiscoverocslink.class.php:677 inc/ipdiscoverocslink.class.php:1231
msgid "Imported / Linked"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:770 inc/menu.class.php:129
+#: inc/ipdiscoverocslink.class.php:771 inc/menu.class.php:129
msgid "Modify Subnet"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:778
+#: inc/ipdiscoverocslink.class.php:779
msgid "Subnet Name"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:786 inc/ipdiscoverocslink.class.php:805
+#: inc/ipdiscoverocslink.class.php:787 inc/ipdiscoverocslink.class.php:806
msgid "Choose ID"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:964
+#: inc/ipdiscoverocslink.class.php:966
msgid "Unable to add. an object with same MAC address already exists."
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1253
+#: inc/ipdiscoverocslink.class.php:1256
msgid "No new IPDiscover device to import"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1292 inc/ipdiscoverocslink.class.php:1343
-#: inc/ocslink.class.php:380 inc/ocsserver.class.php:4475
-#: inc/ocsserver.class.php:4674 inc/snmpocslink.class.php:523
-#: inc/snmpocslink.class.php:2710 inc/snmpocslink.class.php:2739
+#: inc/ipdiscoverocslink.class.php:1295 inc/ipdiscoverocslink.class.php:1346
+#: inc/ocslink.class.php:408 inc/ocsserver.class.php:2428
+#: inc/ocsserver.class.php:2627 inc/snmpocslink.class.php:524
+#: inc/snmpocslink.class.php:2729 inc/snmpocslink.class.php:2758
msgctxt "button"
msgid "Delete link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1299 inc/ocslink.class.php:210
-#: inc/ocslink.class.php:266 inc/ocsserver.class.php:3829
-#: inc/ocsserver.class.php:4075 inc/snmpocslink.class.php:496
-#: inc/snmpocslink.class.php:659 inc/snmpocslink.class.php:796
-#: inc/snmpocslink.class.php:2717
+#: inc/ipdiscoverocslink.class.php:1302 inc/ocslink.class.php:230
+#: inc/ocslink.class.php:286 inc/ocsserver.class.php:1975
+#: inc/ocsserver.class.php:2171 inc/snmpocslink.class.php:497
+#: inc/snmpocslink.class.php:661 inc/snmpocslink.class.php:798
+#: inc/snmpocslink.class.php:2736
msgid "Import date in GLPI"
msgstr "导入日期在GLPI"
-#: inc/ipdiscoverocslink.class.php:1361 inc/ipdiscoverocslink.class.php:1466
-#: inc/ipdiscoverocslink.class.php:1485 inc/ipdiscoverocslink.class.php:1581
-#: inc/ocsserver.class.php:4473 inc/ocsserver.class.php:4672
-#: inc/snmpocslink.class.php:2380 inc/snmpocslink.class.php:2552
+#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1470
+#: inc/ipdiscoverocslink.class.php:1489 inc/ipdiscoverocslink.class.php:1586
+#: inc/ocsserver.class.php:2426 inc/ocsserver.class.php:2625
+#: inc/snmpocslink.class.php:2398 inc/snmpocslink.class.php:2570
msgctxt "button"
msgid "Link"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1364 inc/ipdiscoverocslink.class.php:1469
-#: inc/ipdiscoverocslink.class.php:1488 inc/ipdiscoverocslink.class.php:1584
+#: inc/ipdiscoverocslink.class.php:1367 inc/ipdiscoverocslink.class.php:1473
+#: inc/ipdiscoverocslink.class.php:1492 inc/ipdiscoverocslink.class.php:1589
msgctxt "button"
msgid "Delete from OCSNG"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1370
+#: inc/ipdiscoverocslink.class.php:1373
msgid "DNS"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1372 inc/ipdiscoverocslink.class.php:1492
+#: inc/ipdiscoverocslink.class.php:1375 inc/ipdiscoverocslink.class.php:1496
msgid "OCS Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1379 inc/ipdiscoverocslink.class.php:1502
+#: inc/ipdiscoverocslink.class.php:1382 inc/ipdiscoverocslink.class.php:1506
msgid "GLPI Type"
msgstr ""
-#: inc/ipdiscoverocslink.class.php:1381 inc/ipdiscoverocslink.class.php:1504
-#: inc/ocsserver.class.php:4498 inc/snmpocslink.class.php:2402
+#: inc/ipdiscoverocslink.class.php:1384 inc/ipdiscoverocslink.class.php:1508
+#: inc/ocsserver.class.php:2451 inc/snmpocslink.class.php:2420
msgid "Item to link"
msgstr ""
-#: inc/menu.class.php:67 inc/ocsserver.class.php:357
-#: inc/ocsserver.class.php:358
+#: inc/menu.class.php:67 inc/ocsserver.class.php:306
+#: inc/ocsserver.class.php:307
msgid "Configuration of OCSNG server"
msgstr ""
-#: inc/menu.class.php:73 inc/ocsserver.class.php:482
-#: inc/ocsserver.class.php:483 inc/ocsserver.class.php:484
-#: inc/ocsserver.class.php:4321
+#: inc/menu.class.php:73 inc/ocsserver.class.php:433
+#: inc/ocsserver.class.php:434 inc/ocsserver.class.php:435
+#: inc/ocsserver.class.php:2274
msgid "Import new computers"
msgstr "添加新计算机的导入"
-#: inc/menu.class.php:77 inc/ocsserver.class.php:508
-#: inc/ocsserver.class.php:509 inc/ocsserver.class.php:510
+#: inc/menu.class.php:77 inc/ocsserver.class.php:459
+#: inc/ocsserver.class.php:460 inc/ocsserver.class.php:461
msgid "Synchronize computers already imported"
msgstr "已经导入的计算机的同步"
-#: inc/menu.class.php:81 inc/ocsserver.class.php:536
-#: inc/ocsserver.class.php:537 inc/ocsserver.class.php:538
-#: inc/ocsserver.class.php:4323
+#: inc/menu.class.php:81 inc/ocsserver.class.php:487
+#: inc/ocsserver.class.php:488 inc/ocsserver.class.php:489
+#: inc/ocsserver.class.php:2276
msgid "Link new OCSNG computers to existing GLPI computers"
msgstr ""
-#: inc/menu.class.php:85 inc/ocsserver.class.php:494
-#: inc/ocsserver.class.php:495 inc/ocsserver.class.php:496
+#: inc/menu.class.php:85 inc/ocsserver.class.php:445
+#: inc/ocsserver.class.php:446 inc/ocsserver.class.php:447
msgid "Scripts execution of automatic actions"
msgstr ""
@@ -552,28 +564,28 @@ msgstr ""
msgid "Add a OCSNG server"
msgstr ""
-#: inc/networkport.class.php:456 inc/networkport.class.php:490
+#: inc/networkport.class.php:479 inc/networkport.class.php:513
#: inc/networkporttype.class.php:159
msgid "OCS TYPE"
msgstr ""
-#: inc/networkport.class.php:458 inc/networkport.class.php:491
+#: inc/networkport.class.php:481 inc/networkport.class.php:514
msgid "OCS MIB TYPE"
msgstr ""
-#: inc/networkport.class.php:463
+#: inc/networkport.class.php:486
msgid "Create an entry for defining this type"
msgstr ""
-#: inc/networkport.class.php:492
+#: inc/networkport.class.php:515
msgid "Create a mapping"
msgstr ""
-#: inc/networkport.class.php:566
+#: inc/networkport.class.php:589
msgid "empty"
msgstr ""
-#: inc/networkport.class.php:623
+#: inc/networkport.class.php:646
msgid "No unknown network port type from OCS !"
msgstr ""
@@ -614,15 +626,15 @@ msgstr ""
msgid "Create"
msgstr ""
-#: inc/networkshare.class.php:43 inc/ocsserver.class.php:941
+#: inc/networkshare.class.php:51 inc/ocsserver.class.php:892
msgid "Network shares"
msgstr ""
-#: inc/networkshare.class.php:122 inc/registrykey.class.php:99
+#: inc/networkshare.class.php:187 inc/registrykey.class.php:142
msgid "Path"
msgstr ""
-#: inc/networkshare.class.php:126
+#: inc/networkshare.class.php:191
msgid "Quota"
msgstr ""
@@ -640,15 +652,15 @@ msgstr ""
msgid "Elements not match with the rule by automatic actions"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:62
+#: inc/notificationtargetruleimportentity.class.php:65
msgid "Verification of assignment rules for entities and locations"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:86
+#: inc/notificationtargetruleimportentity.class.php:89
msgid "No rules match"
msgstr ""
-#: inc/notificationtargetruleimportentity.class.php:129
+#: inc/notificationtargetruleimportentity.class.php:132
msgid "Data error"
msgstr ""
@@ -656,854 +668,859 @@ msgstr ""
msgid "Verified rules"
msgstr ""
-#: inc/notimportedcomputer.class.php:452
+#: inc/notimportedcomputer.class.php:451
msgid "Can't affect an entity"
msgstr ""
-#: inc/notimportedcomputer.class.php:455
+#: inc/notimportedcomputer.class.php:454
msgid "Unicity criteria not verified"
msgstr ""
-#: inc/notimportedcomputer.class.php:458
+#: inc/notimportedcomputer.class.php:457
msgid "Import refused by rule"
msgstr ""
-#: inc/notimportedcomputer.class.php:475
+#: inc/notimportedcomputer.class.php:474
msgid "Actions to be made on the computer"
msgstr ""
-#: inc/notimportedcomputer.class.php:642
+#: inc/notimportedcomputer.class.php:647
msgid "Send OCSNG not imported computers alert failed"
msgstr ""
-#: inc/notimportedcomputer.class.php:672
+#: inc/notimportedcomputer.class.php:677
msgid "Not imported computers alert"
msgstr ""
-#: inc/ocslink.class.php:100
+#: inc/ocsapiclient.class.php:104
+msgid "Curl PHP package not installed"
+msgstr ""
+
+#: inc/ocslink.class.php:108
msgid "OCS Inventory NG Import informations"
msgstr ""
-#: inc/ocslink.class.php:173
+#: inc/ocslink.class.php:181
msgid "OCS NG Interface"
msgstr ""
-#: inc/ocslink.class.php:182 inc/ocslink.class.php:374
+#: inc/ocslink.class.php:190 inc/ocslink.class.php:396
+msgctxt "button"
+msgid "Launch synchronization"
+msgstr ""
+
+#: inc/ocslink.class.php:202 inc/ocslink.class.php:402
msgctxt "button"
-msgid "Force synchronization"
+msgid "Force full import"
msgstr ""
-#: inc/ocslink.class.php:205 inc/snmpocslink.class.php:491
-#: inc/snmpocslink.class.php:657
+#: inc/ocslink.class.php:225 inc/snmpocslink.class.php:492
+#: inc/snmpocslink.class.php:659
msgid "OCS Inventory NG SNMP Import informations"
msgstr ""
-#: inc/ocslink.class.php:206 inc/snmpocslink.class.php:492
-#: inc/snmpocslink.class.php:660
+#: inc/ocslink.class.php:226 inc/snmpocslink.class.php:493
+#: inc/snmpocslink.class.php:662
msgid "Imported object"
msgstr ""
-#: inc/ocslink.class.php:208 inc/snmpocslink.class.php:494
-#: inc/snmpocslink.class.php:662
+#: inc/ocslink.class.php:228 inc/snmpocslink.class.php:495
+#: inc/snmpocslink.class.php:664
msgid "Linked object"
msgstr ""
-#: inc/ocslink.class.php:215 inc/snmpocslink.class.php:668
+#: inc/ocslink.class.php:235 inc/snmpocslink.class.php:670
msgctxt "button"
msgid "Force SNMP synchronization"
msgstr ""
-#: inc/ocslink.class.php:239 inc/snmpocslink.class.php:513
-#: inc/snmpocslink.class.php:694 inc/snmpocslink.class.php:2718
+#: inc/ocslink.class.php:259 inc/snmpocslink.class.php:514
+#: inc/snmpocslink.class.php:696 inc/snmpocslink.class.php:2737
msgid "Last OCSNG SNMP inventory date"
msgstr ""
-#: inc/ocslink.class.php:264 inc/snmpocslink.class.php:794
+#: inc/ocslink.class.php:284 inc/snmpocslink.class.php:796
msgid "OCS Inventory NG IPDiscover Import informations"
msgstr ""
-#: inc/ocslink.class.php:334
+#: inc/ocslink.class.php:356
msgid "OCSNG DEVICE ID"
msgstr ""
-#: inc/ocslink.class.php:442 inc/ocslink.class.php:473
-#: inc/ocslink.class.php:486 inc/ocslink.class.php:499
+#: inc/ocslink.class.php:467 inc/ocslink.class.php:498
+#: inc/ocslink.class.php:511 inc/ocslink.class.php:524
msgid "No computer found into OCSNG Database"
msgstr ""
-#: inc/ocslink.class.php:451
+#: inc/ocslink.class.php:476
msgid "Checksum test"
msgstr ""
-#: inc/ocslink.class.php:755
+#: inc/ocslink.class.php:797
msgid "Imported from OCSNG"
msgstr ""
-#: inc/ocslink.class.php:759
+#: inc/ocslink.class.php:801
msgid "Deleted in OCSNG"
msgstr "在OCSNG上删除"
-#: inc/ocslink.class.php:763
+#: inc/ocslink.class.php:805
msgid "Linked with an OCSNG computer"
msgstr "和一台OCSNG电脑相连接"
-#: inc/ocslink.class.php:767
+#: inc/ocslink.class.php:809
#, php-format
msgid "The OCSNG ID of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocslink.class.php:772
+#: inc/ocslink.class.php:814
#, php-format
msgid "The OCSNG TAG of the computer changed from %1$s to %2$s"
msgstr ""
-#: inc/ocsserver.class.php:137
+#: inc/ocslink.class.php:1204
+msgid "Unlock field and import OCSNG data"
+msgstr ""
+
+#: inc/ocsprocess.class.php:711
+#, php-format
+msgid "Unable to link this computer, Serial number is blacklisted (%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:718
+#, php-format
+msgid "Unable to link this computer, UUID is blacklisted (%d)"
+msgstr ""
+
+#. TRANS: %s is the OCS id
+#: inc/ocsprocess.class.php:784
+#, php-format
+msgid ""
+"Unable to import, GLPI computer is already related to an element of OCSNG "
+"(%d)"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1512
+msgid "Computers don't check any rule"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1513
+msgid "Duplicate computers"
+msgstr "重复计算机"
+
+#: inc/ocsprocess.class.php:1514
+msgid "Computers whose import is refused by a rule"
+msgstr "导入计算机被规则拒绝"
+
+#: inc/ocsprocess.class.php:1516
+msgid "SNMP objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1517
+msgid "SNMP objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1518
+msgid "SNMP objects linked"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1519
+msgid "SNMP objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1520
+msgid "SNMP objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1523
+msgid "IPDISCOVER objects imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1524
+msgid "IPDISCOVER objects synchronized"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1525
+msgid "IPDISCOVER objects not updated"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1526
+msgid "IPDISCOVER objects not imported"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1624
+msgid "Statistics of the OCSNG SNMP import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1626
+msgid "Statistics of the OCSNG IPDISCOVER import"
+msgstr ""
+
+#: inc/ocsprocess.class.php:1628
+msgid "Statistics of the OCSNG link"
+msgstr ""
+
+#: inc/ocsserver.class.php:84
msgid "Datas to import"
msgstr ""
-#: inc/ocsserver.class.php:138 inc/ocsserver.class.php:1214
+#: inc/ocsserver.class.php:85 inc/ocsserver.class.php:1165
msgid "Import options"
msgstr "导入选项"
-#: inc/ocsserver.class.php:139 inc/ocsserver.class.php:1103
+#: inc/ocsserver.class.php:86 inc/ocsserver.class.php:1054
msgid "General history"
msgstr ""
-#: inc/ocsserver.class.php:142
+#: inc/ocsserver.class.php:89
msgid "OCSNG console"
msgstr ""
-#: inc/ocsserver.class.php:261
+#: inc/ocsserver.class.php:208
msgid "Expert sync mode"
msgstr ""
-#: inc/ocsserver.class.php:269 inc/ocsserver.class.php:1370
+#: inc/ocsserver.class.php:216 inc/ocsserver.class.php:1322
msgid "Database in UTF8"
msgstr ""
-#: inc/ocsserver.class.php:359
+#: inc/ocsserver.class.php:308
#, php-format
msgid "Configuration of OCSNG server %s"
msgstr ""
-#: inc/ocsserver.class.php:379
+#: inc/ocsserver.class.php:328
msgid "Setup rules engine"
msgstr ""
-#: inc/ocsserver.class.php:386
+#: inc/ocsserver.class.php:335
msgid "Setup rules for choose entity on items import"
msgstr ""
-#: inc/ocsserver.class.php:393
+#: inc/ocsserver.class.php:342
msgid "Setup rules for select criteria for items link"
msgstr ""
-#: inc/ocsserver.class.php:466
+#: inc/ocsserver.class.php:417
msgid "See Setup : Datas to import before"
msgstr ""
-#: inc/ocsserver.class.php:558
+#: inc/ocsserver.class.php:509
msgid ""
"The selected server is not active. Import and synchronisation is not "
"available"
msgstr ""
-#: inc/ocsserver.class.php:663 inc/ocsserver.class.php:668
+#: inc/ocsserver.class.php:614 inc/ocsserver.class.php:619
msgid "General information"
msgstr "常规信息"
-#: inc/ocsserver.class.php:669
+#: inc/ocsserver.class.php:620
msgid "Warning : the import entity rules depends on selected fields"
msgstr ""
-#: inc/ocsserver.class.php:686 inc/ocsserver.class.php:692
-#: inc/ocsserver.class.php:697 inc/ocsserver.class.php:703
+#: inc/ocsserver.class.php:637 inc/ocsserver.class.php:643
+#: inc/ocsserver.class.php:648 inc/ocsserver.class.php:654
msgid "Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:730
+#: inc/ocsserver.class.php:681
msgid "User informations"
msgstr ""
-#: inc/ocsserver.class.php:736
+#: inc/ocsserver.class.php:687
msgid "Affect user from contact"
msgstr ""
-#: inc/ocsserver.class.php:739 inc/ocsserver.class.php:745
-#: inc/ocsserver.class.php:750
+#: inc/ocsserver.class.php:690 inc/ocsserver.class.php:696
+#: inc/ocsserver.class.php:701
msgid "Depends on contact import"
msgstr ""
-#: inc/ocsserver.class.php:742
+#: inc/ocsserver.class.php:693
msgid "Affect user location by default"
msgstr ""
-#: inc/ocsserver.class.php:747
+#: inc/ocsserver.class.php:698
msgid "Affect first group of user by default"
msgstr ""
-#: inc/ocsserver.class.php:768
+#: inc/ocsserver.class.php:719
msgid "After 7006 version of OCS Inventory NG"
msgstr ""
-#: inc/ocsserver.class.php:805
+#: inc/ocsserver.class.php:756
msgid "After 7009 version of OCS Inventory NG && Depends on Bios import"
msgstr ""
-#: inc/ocsserver.class.php:820 inc/ocsserver.class.php:825
+#: inc/ocsserver.class.php:771 inc/ocsserver.class.php:776
msgid "Linked objects"
msgstr ""
-#: inc/ocsserver.class.php:828 inc/ocsserver.class.php:832
+#: inc/ocsserver.class.php:779 inc/ocsserver.class.php:783
msgid "Global import"
msgstr "全局导入"
-#: inc/ocsserver.class.php:829 inc/ocsserver.class.php:833
-#: inc/ocsserver.class.php:858
+#: inc/ocsserver.class.php:780 inc/ocsserver.class.php:784
+#: inc/ocsserver.class.php:809
msgid "Unit import"
msgstr "单位导入"
-#: inc/ocsserver.class.php:834
+#: inc/ocsserver.class.php:785
msgid "Unit import on serial number"
msgstr "单元常数引入连续数字"
-#: inc/ocsserver.class.php:835
+#: inc/ocsserver.class.php:786
msgid "Unit import serial number only"
msgstr ""
-#: inc/ocsserver.class.php:883
+#: inc/ocsserver.class.php:834
msgid ""
"Global import: everything is imported but the material is globally managed "
"(without duplicate)"
msgstr ""
-#: inc/ocsserver.class.php:884
+#: inc/ocsserver.class.php:835
msgid "Unit import: everything is imported as it is"
msgstr ""
-#: inc/ocsserver.class.php:892 inc/ocsserver.class.php:897
+#: inc/ocsserver.class.php:843 inc/ocsserver.class.php:848
msgid "OCS Inventory NG plugins"
msgstr ""
-#: inc/ocsserver.class.php:899
+#: inc/ocsserver.class.php:850
msgid "Microsoft Office licenses"
msgstr ""
-#: inc/ocsserver.class.php:902
+#: inc/ocsserver.class.php:853
msgid ""
"Depends on software import and OfficePack Plugin for (https://github.com"
"/PluginsOCSInventory-NG/officepack) OCSNG must be installed"
msgstr ""
-#: inc/ocsserver.class.php:903
+#: inc/ocsserver.class.php:854
msgid "Antivirus"
msgstr ""
-#: inc/ocsserver.class.php:906
+#: inc/ocsserver.class.php:857
msgid ""
"Security Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/security) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:913
+#: inc/ocsserver.class.php:864
msgid ""
"Uptime Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/uptime) "
"must be installed"
msgstr ""
-#: inc/ocsserver.class.php:914
+#: inc/ocsserver.class.php:865
msgid "Windows Update State"
msgstr ""
-#: inc/ocsserver.class.php:917
+#: inc/ocsserver.class.php:868
msgid ""
"Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winupdate) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:920
+#: inc/ocsserver.class.php:871
msgid "Teamviewer"
msgstr ""
-#: inc/ocsserver.class.php:923
+#: inc/ocsserver.class.php:874
msgid ""
"Teamviewer Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/teamviewer) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:924 inc/proxysetting.class.php:46
+#: inc/ocsserver.class.php:875 inc/proxysetting.class.php:51
msgid "Proxy Settings"
msgstr ""
-#: inc/ocsserver.class.php:927
+#: inc/ocsserver.class.php:878
msgid ""
"Navigator Proxy Setting Plugin for OCSNG (https://github.com"
"/PluginsOCSInventory-NG/navigatorproxysetting) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:930 inc/winuser.class.php:46
+#: inc/ocsserver.class.php:881 inc/winuser.class.php:51
msgid "Windows Users"
msgstr ""
-#: inc/ocsserver.class.php:933
+#: inc/ocsserver.class.php:884
msgid ""
"Winusers Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/winusers) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:935 inc/osinstall.class.php:46
+#: inc/ocsserver.class.php:886 inc/osinstall.class.php:51
msgid "OS Informations"
msgstr ""
-#: inc/ocsserver.class.php:938
+#: inc/ocsserver.class.php:889
msgid ""
"OSInstall Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/osinstall) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:944
+#: inc/ocsserver.class.php:895
msgid ""
"Networkshare Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/networkshare) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:946 inc/service.class.php:46
+#: inc/ocsserver.class.php:897 inc/service.class.php:51
msgid "Service"
msgstr ""
-#: inc/ocsserver.class.php:949
+#: inc/ocsserver.class.php:900
msgid ""
"Service Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/services) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:952 inc/runningprocess.class.php:46
+#: inc/ocsserver.class.php:903 inc/runningprocess.class.php:51
msgid "Running Process"
msgstr ""
-#: inc/ocsserver.class.php:955
+#: inc/ocsserver.class.php:906
msgid ""
"Running Process Plugin for OCSNG (https://github.com/PluginsOCSInventory-"
"NG/runningProcess) must be installed"
msgstr ""
-#: inc/ocsserver.class.php:964 inc/ocsserver.class.php:968
+#: inc/ocsserver.class.php:915 inc/ocsserver.class.php:919
msgid "OCSNG administrative information"
msgstr "OCSNG管理信息"
-#: inc/ocsserver.class.php:1107
+#: inc/ocsserver.class.php:1058
msgid "Do history"
msgstr ""
-#: inc/ocsserver.class.php:1111
+#: inc/ocsserver.class.php:1062
msgid "System history"
msgstr ""
-#: inc/ocsserver.class.php:1127
+#: inc/ocsserver.class.php:1078
msgid "Bios history"
msgstr ""
-#: inc/ocsserver.class.php:1144
+#: inc/ocsserver.class.php:1095
msgid "Devices history"
msgstr ""
-#: inc/ocsserver.class.php:1148
+#: inc/ocsserver.class.php:1099
msgid "Volumes history"
msgstr ""
-#: inc/ocsserver.class.php:1152
+#: inc/ocsserver.class.php:1103
msgid "Network history"
msgstr ""
-#: inc/ocsserver.class.php:1156
+#: inc/ocsserver.class.php:1107
msgid "Monitor connection history"
msgstr ""
-#: inc/ocsserver.class.php:1160
+#: inc/ocsserver.class.php:1111
msgid "Printer connection history"
msgstr ""
-#: inc/ocsserver.class.php:1164
+#: inc/ocsserver.class.php:1115
msgid "Peripheral connection history"
msgstr ""
-#: inc/ocsserver.class.php:1168
+#: inc/ocsserver.class.php:1119
msgid "Software connection history"
msgstr ""
-#: inc/ocsserver.class.php:1172
+#: inc/ocsserver.class.php:1123
msgid "Virtual machines history"
msgstr ""
-#: inc/ocsserver.class.php:1176
+#: inc/ocsserver.class.php:1127
msgid "Administrative infos history"
msgstr ""
-#: inc/ocsserver.class.php:1180
+#: inc/ocsserver.class.php:1131
msgid "Plugins history"
msgstr ""
-#: inc/ocsserver.class.php:1209
+#: inc/ocsserver.class.php:1160
msgid "Web address of the OCSNG console"
msgstr "OCSNG控制台的网络地址"
-#: inc/ocsserver.class.php:1217
+#: inc/ocsserver.class.php:1168
msgid "Limit the import to the following tags (separator $, nothing for all)"
msgstr "极限导入对以下标记(分离器$ ,没什么为所有)"
-#: inc/ocsserver.class.php:1222
+#: inc/ocsserver.class.php:1173
msgid "Exclude the following tags (separator $, nothing for all)"
msgstr "排除下列票单(分隔$,全部都不是)"
-#: inc/ocsserver.class.php:1227
+#: inc/ocsserver.class.php:1178
msgid "Default status"
msgstr "缺省状态"
-#: inc/ocsserver.class.php:1233
+#: inc/ocsserver.class.php:1184
msgid "Behavior when disconnecting"
msgstr ""
-#: inc/ocsserver.class.php:1234
+#: inc/ocsserver.class.php:1185
msgid "Preserve link"
msgstr ""
-#: inc/ocsserver.class.php:1235
+#: inc/ocsserver.class.php:1186
msgid "Put the link in dustbin and add a lock"
msgstr ""
-#: inc/ocsserver.class.php:1236
+#: inc/ocsserver.class.php:1187
msgid "Delete the link permanently"
msgstr ""
-#: inc/ocsserver.class.php:1239
+#: inc/ocsserver.class.php:1190
msgid ""
"Define the action to do on link with other objects when computer is "
"disconnecting from them"
msgstr ""
-#: inc/ocsserver.class.php:1242 inc/ocsserver.class.php:8518
+#: inc/ocsserver.class.php:1193 inc/ocsserver.class.php:3095
msgid "Use the OCSNG software dictionary"
msgstr "使用OCSNG软件词典"
-#: inc/ocsserver.class.php:1246
+#: inc/ocsserver.class.php:1197
msgid ""
"If Use the OCSNG software dictionary parameter is checked, no software will "
"be imported before you setup them into OCS"
msgstr ""
-#: inc/ocsserver.class.php:1250
+#: inc/ocsserver.class.php:1201
msgid "Number of items to synchronize via the automatic OCSNG action"
msgstr "项目数同步通过自动OCSNG方式"
-#: inc/ocsserver.class.php:1258
+#: inc/ocsserver.class.php:1209
msgid ""
"The automatic task ocsng is launched only if server is not in expert mode"
msgstr ""
-#: inc/ocsserver.class.php:1259
+#: inc/ocsserver.class.php:1210
msgid ""
"The automatic task ocsng only synchronize existant computers, it doesn't "
"import new computers"
msgstr ""
-#: inc/ocsserver.class.php:1260
+#: inc/ocsserver.class.php:1211
msgid ""
"If you want to import new computers, disable this parameter, change to "
"expert mode and use script from system"
msgstr ""
-#: inc/ocsserver.class.php:1264
+#: inc/ocsserver.class.php:1215
msgid "Behavior to the deletion of a computer in OCSNG"
msgstr ""
-#: inc/ocsserver.class.php:1269
+#: inc/ocsserver.class.php:1221
#, php-format
msgid "Change to state %s"
msgstr "改变状态 %s"
-#: inc/ocsserver.class.php:1312
+#: inc/ocsserver.class.php:1264
msgid "Database"
msgstr ""
-#: inc/ocsserver.class.php:1317
+#: inc/ocsserver.class.php:1269
msgid "Standard (allow manual actions)"
msgstr ""
-#: inc/ocsserver.class.php:1318
+#: inc/ocsserver.class.php:1270
msgid "Expert (Fully automatic, for large configuration)"
msgstr ""
-#: inc/ocsserver.class.php:1322
+#: inc/ocsserver.class.php:1274
msgid "Connection type"
msgstr ""
-#: inc/ocsserver.class.php:1346
+#: inc/ocsserver.class.php:1298
msgctxt "button"
msgid "Reload Checksum"
msgstr ""
-#: inc/ocsserver.class.php:1353 inc/ocsserver.class.php:8516
+#: inc/ocsserver.class.php:1305 inc/ocsserver.class.php:3093
msgid "Host"
msgstr ""
-#: inc/ocsserver.class.php:1356
+#: inc/ocsserver.class.php:1308
msgid "Like http://127.0.0.1 for SOAP method"
msgstr ""
-#: inc/ocsserver.class.php:1358
+#: inc/ocsserver.class.php:1310
msgid "Synchronisation method"
msgstr ""
-#: inc/ocsserver.class.php:1393
+#: inc/ocsserver.class.php:1345
msgid "Use automatic action for clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:1419
+#: inc/ocsserver.class.php:1371
msgid "Use automatic action restore deleted computer"
msgstr ""
-#: inc/ocsserver.class.php:1435
+#: inc/ocsserver.class.php:1387
msgid ""
"Number of days for the restoration of computers from the date of last "
"inventory"
msgstr ""
-#: inc/ocsserver.class.php:1444
+#: inc/ocsserver.class.php:1396
msgid "Use automatic action to check entity assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1446
+#: inc/ocsserver.class.php:1398
msgid ""
"Use automatic action to check and send a notification for machines that no "
"longer respond the entity and location assignment rules"
msgstr ""
-#: inc/ocsserver.class.php:1454
+#: inc/ocsserver.class.php:1406
msgid "Use automatic locks"
msgstr ""
-#: inc/ocsserver.class.php:1484
-msgid "Purge computers in OCSNG"
-msgstr ""
-
-#: inc/ocsserver.class.php:1487
-msgid "Delete computers"
-msgstr ""
-
-#: inc/ocsserver.class.php:1510
+#: inc/ocsserver.class.php:1432
msgid "Connecting to the database"
msgstr ""
-#: inc/ocsserver.class.php:1514
+#: inc/ocsserver.class.php:1436
msgid "Connection to the database failed"
msgstr ""
-#: inc/ocsserver.class.php:1516
+#: inc/ocsserver.class.php:1438
msgid "Invalid OCSNG Version: RC3 is required"
msgstr "无效的OCSNG版本:要求最低 RC3"
-#: inc/ocsserver.class.php:1518
+#: inc/ocsserver.class.php:1440
msgid "Invalid OCSNG configuration (TRACE_DELETED must be active)"
msgstr ""
-#: inc/ocsserver.class.php:1527
+#: inc/ocsserver.class.php:1449
msgid "Connection to database successful"
msgstr ""
-#: inc/ocsserver.class.php:1529
+#: inc/ocsserver.class.php:1451
msgid "Valid OCSNG configuration and version"
msgstr "有效的OCSNG版本"
-#: inc/ocsserver.class.php:1648
+#: inc/ocsserver.class.php:1571
msgid "Unable to add. The OCSNG server already exists."
msgstr ""
-#: inc/ocsserver.class.php:2010
-#, php-format
-msgid "Unable to link this computer, Serial number is blacklisted (%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2017
-#, php-format
-msgid "Unable to link this computer, UUID is blacklisted (%d)"
-msgstr ""
-
-#. TRANS: %s is the OCS id
-#: inc/ocsserver.class.php:2172
-#, php-format
-msgid ""
-"Unable to import, GLPI computer is already related to an element of OCSNG "
-"(%d)"
-msgstr ""
-
-#: inc/ocsserver.class.php:2546 inc/ocsserver.class.php:3453
-msgid "Swap"
-msgstr ""
-
-#: inc/ocsserver.class.php:3830
+#: inc/ocsserver.class.php:1976
msgid "Existing in GLPI"
msgstr "在GLPI中存在"
-#: inc/ocsserver.class.php:3831
+#: inc/ocsserver.class.php:1977
msgid "Existing in OCSNG"
msgstr "在OCSNG中存在"
-#: inc/ocsserver.class.php:3873
+#: inc/ocsserver.class.php:2019
msgid "No item to clean"
msgstr "无条目要清除"
-#: inc/ocsserver.class.php:3962 inc/ocsserver.class.php:4126
-#: inc/ocsserver.class.php:4133
+#: inc/ocsserver.class.php:2058 inc/ocsserver.class.php:2222
+#: inc/ocsserver.class.php:2229
msgid "No new computer to be updated"
msgstr "无新计算机被更新"
-#: inc/ocsserver.class.php:4053
+#: inc/ocsserver.class.php:2149
msgid "Computers updated in OCSNG"
msgstr "OCSNG更新了计算机"
-#: inc/ocsserver.class.php:4070 inc/ocsserver.class.php:4111
-#: inc/snmpocslink.class.php:2708 inc/snmpocslink.class.php:2737
+#: inc/ocsserver.class.php:2166 inc/ocsserver.class.php:2207
+#: inc/snmpocslink.class.php:2727 inc/snmpocslink.class.php:2756
msgctxt "button"
msgid "Synchronize"
msgstr "同步"
-#: inc/ocsserver.class.php:4073 inc/ocsserver.class.php:4122
+#: inc/ocsserver.class.php:2169 inc/ocsserver.class.php:2218
msgid "Update computers"
msgstr "更新计算机"
-#: inc/ocsserver.class.php:4421 inc/snmpocslink.class.php:2341
+#: inc/ocsserver.class.php:2374 inc/snmpocslink.class.php:2359
msgid ""
"Caution! The imported data (see your configuration) will overwrite the "
"existing one"
msgstr ""
-#: inc/ocsserver.class.php:4437
+#: inc/ocsserver.class.php:2390
msgid "Manual import mode"
msgstr "手动引入方式"
-#: inc/ocsserver.class.php:4440
+#: inc/ocsserver.class.php:2393
msgid "Disable preview"
msgstr ""
-#: inc/ocsserver.class.php:4442
+#: inc/ocsserver.class.php:2395
msgid "Enable preview"
msgstr "建立预览"
-#: inc/ocsserver.class.php:4446 inc/ocsserver.class.php:4658
+#: inc/ocsserver.class.php:2399 inc/ocsserver.class.php:2611
msgid "Check first that duplicates have been correctly managed in OCSNG"
msgstr "初步检查,重复数据已经在OCSNG的到正确处理"
-#: inc/ocsserver.class.php:4478 inc/ocsserver.class.php:4677
-#: inc/snmpocslink.class.php:2377 inc/snmpocslink.class.php:2549
+#: inc/ocsserver.class.php:2431 inc/ocsserver.class.php:2630
+#: inc/snmpocslink.class.php:2395 inc/snmpocslink.class.php:2567
msgctxt "button"
msgid "Import"
msgstr "导入"
-#: inc/ocsserver.class.php:4493
+#: inc/ocsserver.class.php:2446
msgid "Match the rule ?"
msgstr "比较规则?"
-#: inc/ocsserver.class.php:4495
+#: inc/ocsserver.class.php:2448
msgid "Target location"
msgstr "目标位置"
-#: inc/ocsserver.class.php:4533
+#: inc/ocsserver.class.php:2486
msgid "Blacklisted serial number"
msgstr ""
-#: inc/ocsserver.class.php:4545
+#: inc/ocsserver.class.php:2498
msgid "Blacklisted UUID"
msgstr ""
-#: inc/ocsserver.class.php:4564
+#: inc/ocsserver.class.php:2517
msgid "Blacklisted MAC"
msgstr ""
-#: inc/ocsserver.class.php:4574
+#: inc/ocsserver.class.php:2527
msgid "Blacklisted IP"
msgstr ""
-#: inc/ocsserver.class.php:4656
+#: inc/ocsserver.class.php:2609
msgid "Warning ! This computer is already linked with another OCS computer."
msgstr ""
-#: inc/ocsserver.class.php:4695 inc/ocsserver.class.php:4710
-#: inc/ocsserver.class.php:4724
+#: inc/ocsserver.class.php:2648 inc/ocsserver.class.php:2663
+#: inc/ocsserver.class.php:2677
msgid "No new computer to be imported"
msgstr "无新增计算机被导入"
-#: inc/ocsserver.class.php:6509
-msgid "Software deleted by OCSNG synchronization"
+#: inc/ocsserver.class.php:2748
+msgid "Purge computers in OCSNG"
+msgstr ""
+
+#: inc/ocsserver.class.php:2751
+msgid "Delete computers"
msgstr ""
-#: inc/ocsserver.class.php:7010
+#: inc/ocsserver.class.php:2768
msgid "Launch OCSNG synchronization script"
msgstr ""
-#: inc/ocsserver.class.php:7014
+#: inc/ocsserver.class.php:2772
msgid "Clean old agents & drop from OCSNG software"
msgstr ""
-#: inc/ocsserver.class.php:7018
+#: inc/ocsserver.class.php:2776
msgid "Restore computers from the date of last inventory"
msgstr ""
-#: inc/ocsserver.class.php:7064
+#: inc/ocsserver.class.php:2822
msgid "Clean old agents OK"
msgstr ""
-#: inc/ocsserver.class.php:7067
+#: inc/ocsserver.class.php:2825
msgid "Clean old agents failed"
msgstr ""
-#: inc/ocsserver.class.php:7079
+#: inc/ocsserver.class.php:2837
msgid "Delete computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7082
+#: inc/ocsserver.class.php:2840
msgid "Delete computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7148
+#: inc/ocsserver.class.php:2906
msgid "Restore computers OK"
msgstr ""
-#: inc/ocsserver.class.php:7151
+#: inc/ocsserver.class.php:2909
msgid "Restore computers failed"
msgstr ""
-#: inc/ocsserver.class.php:7178
+#: inc/ocsserver.class.php:2936
msgid "Launch OCSNG synchronization script from server"
msgstr ""
-#: inc/ocsserver.class.php:7255
-msgid "Computers don't check any rule"
-msgstr ""
-
-#: inc/ocsserver.class.php:7256
-msgid "Duplicate computers"
-msgstr "重复计算机"
-
-#: inc/ocsserver.class.php:7257
-msgid "Computers whose import is refused by a rule"
-msgstr "导入计算机被规则拒绝"
-
-#: inc/ocsserver.class.php:7259
-msgid "SNMP objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7260
-msgid "SNMP objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7261
-msgid "SNMP objects linked"
-msgstr ""
-
-#: inc/ocsserver.class.php:7262
-msgid "SNMP objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7263
-msgid "SNMP objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7266
-msgid "IPDISCOVER objects imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7267
-msgid "IPDISCOVER objects synchronized"
-msgstr ""
-
-#: inc/ocsserver.class.php:7268
-msgid "IPDISCOVER objects not updated"
-msgstr ""
-
-#: inc/ocsserver.class.php:7269
-msgid "IPDISCOVER objects not imported"
-msgstr ""
-
-#: inc/ocsserver.class.php:7367
-msgid "Statistics of the OCSNG SNMP import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7369
-msgid "Statistics of the OCSNG IPDISCOVER import"
-msgstr ""
-
-#: inc/ocsserver.class.php:7371
-msgid "Statistics of the OCSNG link"
-msgstr ""
-
-#: inc/osinstall.class.php:92
+#: inc/osinstall.class.php:159
msgid "Build version"
msgstr ""
-#: inc/osinstall.class.php:94
+#: inc/osinstall.class.php:161
msgid "Installation date"
msgstr ""
-#: inc/osinstall.class.php:99
+#: inc/osinstall.class.php:166
msgid "Codeset"
msgstr ""
-#: inc/osinstall.class.php:101
+#: inc/osinstall.class.php:168
msgid "Country code"
msgstr ""
-#: inc/osinstall.class.php:106
+#: inc/osinstall.class.php:173
msgid "OS Language"
msgstr ""
-#: inc/osinstall.class.php:108
+#: inc/osinstall.class.php:175
msgid "Current Timezone"
msgstr ""
-#: inc/osinstall.class.php:113
+#: inc/osinstall.class.php:180
msgid "Locale"
msgstr ""
-#: inc/profile.class.php:166
+#: inc/profile.class.php:167
msgid "Allowed OCSNG server"
msgid_plural "Allowed OCSNG servers"
msgstr[0] ""
-#: inc/profile.class.php:259
+#: inc/profile.class.php:260
msgid "Manually synchronization"
msgstr ""
-#: inc/profile.class.php:264
+#: inc/profile.class.php:265
msgid "See information"
msgstr ""
-#: inc/profile.class.php:273
+#: inc/profile.class.php:274
msgid "Import computer"
msgstr ""
-#: inc/profile.class.php:278
+#: inc/profile.class.php:279
msgid "Link computer"
msgstr ""
-#: inc/proxysetting.class.php:128
+#: inc/proxysetting.class.php:192
msgid "Auto Config URL"
msgstr ""
-#: inc/proxysetting.class.php:130
+#: inc/proxysetting.class.php:194
msgid "Proxy exceptions"
msgstr ""
-#: inc/registrykey.class.php:91
+#: inc/registrykey.class.php:134
#, php-format
msgid "%d registry key found"
msgid_plural "%d registry keys found"
msgstr[0] ""
-#: inc/registrykey.class.php:98
+#: inc/registrykey.class.php:141
msgid "Hive"
msgstr ""
-#: inc/registrykey.class.php:118
+#: inc/registrykey.class.php:161
msgid "No key found in registry"
msgstr "没有发现关键的在注册表中"
@@ -1518,47 +1535,47 @@ msgstr ""
msgid "Items that do not meet the allocation rules for the entity %s: %s"
msgstr ""
-#: inc/runningprocess.class.php:126
+#: inc/runningprocess.class.php:179
msgid "Process ID"
msgstr ""
-#: inc/runningprocess.class.php:128
+#: inc/runningprocess.class.php:181
msgid "Process memory"
msgstr ""
-#: inc/runningprocess.class.php:129
+#: inc/runningprocess.class.php:182
msgid "Command line"
msgstr ""
-#: inc/runningprocess.class.php:131
+#: inc/runningprocess.class.php:184
msgid "Company"
msgstr ""
-#: inc/service.class.php:122
+#: inc/service.class.php:176
msgid "Full name"
msgstr ""
-#: inc/service.class.php:123
+#: inc/service.class.php:177
msgid "Service Status"
msgstr ""
-#: inc/service.class.php:125
+#: inc/service.class.php:179
msgid "Start type"
msgstr ""
-#: inc/service.class.php:126
+#: inc/service.class.php:180
msgid "Access path"
msgstr ""
-#: inc/service.class.php:127
+#: inc/service.class.php:181
msgid "Session"
msgstr ""
-#: inc/service.class.php:128
+#: inc/service.class.php:182
msgid "Exit code"
msgstr ""
-#: inc/service.class.php:129
+#: inc/service.class.php:183
msgid "Spec Exit code"
msgstr ""
@@ -1755,93 +1772,97 @@ msgid "See Setup : SNMP Import before"
msgstr ""
#: inc/snmpocslink.class.php:449 inc/snmpocslink.class.php:450
-#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2236
+#: inc/snmpocslink.class.php:451 inc/snmpocslink.class.php:2254
msgid "Import new SNMP devices"
msgstr ""
-#: inc/snmpocslink.class.php:720
+#: inc/snmpocslink.class.php:722
msgid "Cartridges informations"
msgstr ""
-#: inc/snmpocslink.class.php:755
+#: inc/snmpocslink.class.php:757
msgid "Trays informations"
msgstr ""
-#: inc/snmpocslink.class.php:1014
+#: inc/snmpocslink.class.php:1019
msgid "Printer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:1531
+#: inc/snmpocslink.class.php:1548
msgid "Computer Memory"
msgstr ""
-#: inc/snmpocslink.class.php:2169
+#: inc/snmpocslink.class.php:2187
msgid "Filter SNMP Objects list"
msgstr ""
-#: inc/snmpocslink.class.php:2172
+#: inc/snmpocslink.class.php:2190
msgid "By itemtype"
msgstr ""
-#: inc/snmpocslink.class.php:2178
+#: inc/snmpocslink.class.php:2196
msgid "By IP"
msgstr ""
-#: inc/snmpocslink.class.php:2238
+#: inc/snmpocslink.class.php:2256
msgid "Import new SNMP devices into glpi"
msgstr ""
-#: inc/snmpocslink.class.php:2394
+#: inc/snmpocslink.class.php:2412
msgid "Contact SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2395
+#: inc/snmpocslink.class.php:2413
msgid "Location SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2396
+#: inc/snmpocslink.class.php:2414
msgid "Type SNMP"
msgstr ""
-#: inc/snmpocslink.class.php:2399
+#: inc/snmpocslink.class.php:2417
msgid "Item type to create"
msgstr ""
-#: inc/snmpocslink.class.php:2571 inc/snmpocslink.class.php:2581
-#: inc/snmpocslink.class.php:2590
+#: inc/snmpocslink.class.php:2589 inc/snmpocslink.class.php:2599
+#: inc/snmpocslink.class.php:2608
msgid "No new SNMP device to be imported"
msgstr ""
-#: inc/snmpocslink.class.php:2632 inc/snmpocslink.class.php:2754
-#: inc/snmpocslink.class.php:2757
+#: inc/snmpocslink.class.php:2651 inc/snmpocslink.class.php:2773
+#: inc/snmpocslink.class.php:2776
msgid "No new SNMP device to be updated"
msgstr ""
-#: inc/snmpocslink.class.php:2695
+#: inc/snmpocslink.class.php:2714
msgid "Snmp device updated in OCSNG"
msgstr ""
-#: inc/snmpocslink.class.php:2714
+#: inc/snmpocslink.class.php:2733
msgid "GLPI Object"
msgstr ""
-#: inc/snmpocslink.class.php:2716
+#: inc/snmpocslink.class.php:2735
msgid "OCS SNMP device"
msgstr ""
-#: inc/snmpocslink.class.php:2750
+#: inc/snmpocslink.class.php:2769
msgid "Update SNMP device"
msgstr ""
-#: inc/teamviewer.class.php:48
+#: inc/software.class.php:263
+msgid "Software deleted by OCSNG synchronization"
+msgstr ""
+
+#: inc/teamviewer.class.php:53
msgid "Teamviewer access"
msgstr ""
-#: inc/teamviewer.class.php:127
+#: inc/teamviewer.class.php:179
msgid "Teamviewer ID"
msgstr ""
-#: inc/teamviewer.class.php:179 inc/teamviewer.class.php:241
+#: inc/teamviewer.class.php:231 inc/teamviewer.class.php:294
msgid "Teamviewer direct access"
msgstr ""
@@ -1906,54 +1927,54 @@ msgstr ""
msgid "Delete processes after"
msgstr ""
-#: inc/winupdate.class.php:46
+#: inc/winupdate.class.php:51
msgid "Windows Updates"
msgstr ""
-#: inc/winupdate.class.php:125
+#: inc/winupdate.class.php:183
msgid "AU Options"
msgstr ""
-#: inc/winupdate.class.php:126
+#: inc/winupdate.class.php:184
msgid "Schedule Install Date"
msgstr ""
-#: inc/winupdate.class.php:127
+#: inc/winupdate.class.php:185
msgid "Last Success Time"
msgstr ""
-#: inc/winupdate.class.php:128
+#: inc/winupdate.class.php:186
msgid "Detect Success Time"
msgstr ""
-#: inc/winupdate.class.php:129
+#: inc/winupdate.class.php:187
msgid "Download Success Time"
msgstr ""
-#: inc/winupdate.class.php:171
+#: inc/winupdate.class.php:229
msgid "Automatic Updates is required and users can configure it"
msgstr ""
-#: inc/winupdate.class.php:174
+#: inc/winupdate.class.php:232
msgid "Automatically download and schedule installation"
msgstr ""
-#: inc/winupdate.class.php:177
+#: inc/winupdate.class.php:235
msgid "Automatically download and notify of installation"
msgstr ""
-#: inc/winupdate.class.php:180
+#: inc/winupdate.class.php:238
msgid "Notify before download"
msgstr ""
-#: inc/winupdate.class.php:183
+#: inc/winupdate.class.php:241
msgid "Disables AU"
msgstr ""
-#: inc/winuser.class.php:129
+#: inc/winuser.class.php:188
msgid "Disabled"
msgstr ""
-#: inc/winuser.class.php:130
+#: inc/winuser.class.php:189
msgid "SID"
msgstr ""
diff --git a/setup.php b/setup.php
index ba1935ec..522a5291 100644
--- a/setup.php
+++ b/setup.php
@@ -190,7 +190,7 @@ function plugin_init_ocsinventoryng() {
function plugin_version_ocsinventoryng() {
return ['name' => "OCS Inventory NG",
- 'version' => '1.5.1',
+ 'version' => '1.5.2',
'author' => 'Gilles Dubois, Remi Collet, Nelly Mahu-Lasson, David Durieux, Xavier Caillaud, Walid Nouh, Arthur Jaouen',
'license' => 'GPLv2+',
'homepage' => 'https://github.com/pluginsGLPI/ocsinventoryng',
diff --git a/tools/extract_template.sh b/tools/extract_template.sh
index 05c795d2..1be34df9 100644
--- a/tools/extract_template.sh
+++ b/tools/extract_template.sh
@@ -2,6 +2,6 @@
# Only strings with domain specified are extracted (use Xt args of keyword param to set number of args needed)
-xgettext *.php */*.php --copyright-holder='Ocsinventoryng Development Team' --package-name='GLPI - Ocsinventoryng plugin' --package-version='1.3.3' -o locales/glpi.pot -L PHP --add-comments=TRANS --from-code=UTF-8 --force-po \
+xgettext *.php */*.php --copyright-holder='Ocsinventoryng Development Team' --package-name='GLPI - Ocsinventoryng plugin' --package-version='1.5.1' -o locales/glpi.pot -L PHP --add-comments=TRANS --from-code=UTF-8 --force-po \
--keyword=_n:1,2,4t --keyword=__s:1,2t --keyword=__:1,2t --keyword=_e:1,2t --keyword=_x:1c,2,3t \
--keyword=_ex:1c,2,3t --keyword=_nx:1c,2,3,5t --keyword=_sx:1c,2,3t
\ No newline at end of file
|