From adc0d833494bdfc5cf36c44aecbe0724a5ab7cc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 14 Nov 2019 16:04:08 +0100 Subject: [PATCH 1/3] Add GLPI 9.5 compatibility * Replace usage of deprecated 'getAllDatasFromTable()' * Replace usage of deprecated 'DBMysql::fetch_assoc()' * Replace usage of deprecated 'DBMysql::fetch_array()' * Handle replacement of domains_id by domain items * Add marketplace compatibility * Use GLPI 9.5 min required PHP version * Add 2.7.0 version definition --- .travis.yml | 7 +- ajax/dropdownReplaceFindDevice.php | 2 +- composer.json | 9 +- composer.lock | 827 +++++++++++++++++++---------- hook.php | 28 +- inc/model.class.php | 6 +- inc/replace.class.php | 4 +- inc/uninstall.class.php | 19 +- setup.php | 35 +- uninstall.xml | 4 +- 10 files changed, 587 insertions(+), 354 deletions(-) diff --git a/.travis.yml b/.travis.yml index b389e06..17203bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,7 @@ language: php php: - - 5.6 + - 7.2 - 7.4 - - nightly before_script: - composer self-update @@ -11,10 +10,6 @@ before_script: script: - vendor/bin/robo --no-interaction code:cs --strict -matrix: - allow_failures: - - php: nightly - cache: directories: - $HOME/.composer/cache diff --git a/ajax/dropdownReplaceFindDevice.php b/ajax/dropdownReplaceFindDevice.php index 89fface..69aa0b8 100644 --- a/ajax/dropdownReplaceFindDevice.php +++ b/ajax/dropdownReplaceFindDevice.php @@ -104,7 +104,7 @@ ORDER BY `name` $LIMIT"; $result = $DB->query($query); -while ($data = $DB->fetch_assoc($result)) { +while ($data = $DB->fetchAssoc($result)) { $outputval = Toolbox::unclean_cross_side_scripting_deep($data["name"]); if ($displaywith) { diff --git a/composer.json b/composer.json index e21ea28..d3318a0 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,15 @@ { + "require": { + "php": "^7.2" + }, "require-dev": { "glpi-project/tools": "^0.1" }, "config": { + "optimize-autoloader": true, "platform": { - "php": "5.6" - } + "php": "7.2.0" + }, + "sort-packages": true } } diff --git a/composer.lock b/composer.lock index a716401..ac3b4d4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,36 +4,36 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1780e587040d1a21844800dc378c2f2e", + "content-hash": "469eca19f475207181e67a99b51f34a4", "packages": [], "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "2.12.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "512a2e54c98f3af377589de76c43b24652bcb789" + "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/512a2e54c98f3af377589de76c43b24652bcb789", - "reference": "512a2e54c98f3af377589de76c43b24652bcb789", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/efc58dc0f34a45539787c5190b41b5d2a50a08da", + "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da", "shasum": "" }, "require": { - "consolidation/output-formatters": "^3.4", - "php": ">=5.4.5", - "psr/log": "^1", - "symfony/console": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.5|^3|^4", - "symfony/finder": "^2.5|^3|^4" + "consolidation/output-formatters": "^4.1.1", + "php": ">=7.1.3", + "psr/log": "^1|^2", + "symfony/console": "^4.4.8|^5", + "symfony/event-dispatcher": "^4.4.8|^5", + "symfony/finder": "^4.4.8|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", + "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^6", - "squizlabs/php_codesniffer": "^2.7" + "squizlabs/php_codesniffer": "^3" }, "type": "library", "extra": { @@ -47,42 +47,10 @@ "php": "7.1.3" } } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - }, - "scenario-options": { - "create-lockfile": "false" - } - }, - "phpunit4": { - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } } }, "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -101,7 +69,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2019-03-08T16:55:03+00:00" + "time": "2020-05-27T21:11:36+00:00" }, { "name": "consolidation/config", @@ -186,74 +154,45 @@ }, { "name": "consolidation/log", - "version": "1.1.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/consolidation/log.git", - "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a" + "reference": "ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/log/zipball/b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", - "reference": "b2e887325ee90abc96b0a8b7b474cd9e7c896e3a", + "url": "https://api.github.com/repos/consolidation/log/zipball/ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf", + "reference": "ba0bf6af1fbd09ed4dc18fc2f27b12ceff487cbf", "shasum": "" }, "require": { - "php": ">=5.4.5", + "php": ">=7.1.3", "psr/log": "^1.0", - "symfony/console": "^2.8|^3|^4" + "symfony/console": "^4|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", + "php-coveralls/php-coveralls": "^2.2", "phpunit/phpunit": "^6", - "squizlabs/php_codesniffer": "^2" + "squizlabs/php_codesniffer": "^3" }, "type": "library", "extra": { "scenarios": { "symfony4": { - "require": { - "symfony/console": "^4.0" - }, - "config": { - "platform": { - "php": "7.1.3" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } - }, - "phpunit4": { - "require-dev": { - "phpunit/phpunit": "^4.8.36" + "symfony/console": "^4" }, - "remove": [ - "php-coveralls/php-coveralls" - ], "config": { "platform": { - "php": "5.4.8" + "php": "7.1.3" } } } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -272,35 +211,35 @@ } ], "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.", - "time": "2019-01-01T17:30:51+00:00" + "time": "2020-05-27T17:06:13+00:00" }, { "name": "consolidation/output-formatters", - "version": "3.5.0", + "version": "4.1.1", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "99ec998ffb697e0eada5aacf81feebfb13023605" + "reference": "9deeddd6a916d0a756b216a8b40ce1016e17c0b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/99ec998ffb697e0eada5aacf81feebfb13023605", - "reference": "99ec998ffb697e0eada5aacf81feebfb13023605", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/9deeddd6a916d0a756b216a8b40ce1016e17c0b9", + "reference": "9deeddd6a916d0a756b216a8b40ce1016e17c0b9", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", - "php": ">=5.4.0", - "symfony/console": "^2.8|^3|^4", - "symfony/finder": "^2.5|^3|^4" + "php": ">=7.1.3", + "symfony/console": "^4|^5", + "symfony/finder": "^4|^5" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", - "phpunit/phpunit": "^5.7.27", - "squizlabs/php_codesniffer": "^2.7", - "symfony/var-dumper": "^2.8|^3|^4", - "victorjonsson/markdowndocs": "^1.3" + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^3", + "symfony/var-dumper": "^4", + "symfony/yaml": "^4" }, "suggest": { "symfony/var-dumper": "For using the var_dump formatter" @@ -312,49 +251,15 @@ "require": { "symfony/console": "^4.0" }, - "require-dev": { - "phpunit/phpunit": "^6" - }, "config": { "platform": { "php": "7.1.3" } } - }, - "symfony3": { - "require": { - "symfony/console": "^3.4", - "symfony/finder": "^3.4", - "symfony/var-dumper": "^3.4" - }, - "config": { - "platform": { - "php": "5.6.32" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - }, - "scenario-options": { - "create-lockfile": "false" - } } }, "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "4.x-dev" } }, "autoload": { @@ -373,30 +278,30 @@ } ], "description": "Format text by applying transformations provided by plug-in formatters.", - "time": "2019-05-30T23:16:01+00:00" + "time": "2020-05-27T20:51:17+00:00" }, { "name": "consolidation/robo", - "version": "1.4.11", + "version": "1.4.12", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "5fa1d901776a628167a325baa9db95d8edf13a80" + "reference": "eb45606f498b3426b9a98b7c85e300666a968e51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80", - "reference": "5fa1d901776a628167a325baa9db95d8edf13a80", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/eb45606f498b3426b9a98b7c85e300666a968e51", + "reference": "eb45606f498b3426b9a98b7c85e300666a968e51", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.11.0", - "consolidation/config": "^1.2", - "consolidation/log": "~1", - "consolidation/output-formatters": "^3.1.13", - "consolidation/self-update": "^1", - "grasmash/yaml-expander": "^1.3", - "league/container": "^2.2", + "consolidation/annotated-command": "^2.11.0|^4.1", + "consolidation/config": "^1.2.1", + "consolidation/log": "^1.1.1|^2", + "consolidation/output-formatters": "^3.1.13|^4.1", + "consolidation/self-update": "^1.1.5", + "grasmash/yaml-expander": "^1.4", + "league/container": "^2.4.1", "php": ">=5.5.0", "symfony/console": "^2.8|^3|^4", "symfony/event-dispatcher": "^2.5|^3|^4", @@ -408,20 +313,13 @@ "codegyre/robo": "< 1.0" }, "require-dev": { - "codeception/aspect-mock": "^1|^2.1.1", - "codeception/base": "^2.3.7", - "codeception/verify": "^0.3.2", "g1a/composer-test-scenarios": "^3", - "goaop/framework": "~2.1.2", - "goaop/parser-reflection": "^1.1.0", "natxet/cssmin": "3.0.4", - "nikic/php-parser": "^3.1.5", - "patchwork/jsqueeze": "~2", + "patchwork/jsqueeze": "^2", "pear/archive_tar": "^1.4.4", "php-coveralls/php-coveralls": "^1", - "phpunit/php-code-coverage": "~2|~4", - "sebastian/comparator": "^1.2.4", - "squizlabs/php_codesniffer": "^2.8" + "phpunit/phpunit": "^5.7.27", + "squizlabs/php_codesniffer": "^3" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", @@ -449,8 +347,11 @@ "require": { "symfony/console": "^2.8" }, + "require-dev": { + "phpunit/phpunit": "^4.8.36" + }, "remove": [ - "goaop/framework" + "php-coveralls/php-coveralls" ], "config": { "platform": { @@ -463,7 +364,7 @@ } }, "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -482,26 +383,26 @@ } ], "description": "Modern task runner", - "time": "2019-10-29T15:50:02+00:00" + "time": "2020-02-18T17:31:26+00:00" }, { "name": "consolidation/self-update", - "version": "1.1.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/consolidation/self-update.git", - "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54" + "reference": "dba6b2c0708f20fa3ba8008a2353b637578849b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/self-update/zipball/a1c273b14ce334789825a09d06d4c87c0a02ad54", - "reference": "a1c273b14ce334789825a09d06d4c87c0a02ad54", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/dba6b2c0708f20fa3ba8008a2353b637578849b4", + "reference": "dba6b2c0708f20fa3ba8008a2353b637578849b4", "shasum": "" }, "require": { "php": ">=5.5.0", - "symfony/console": "^2.8|^3|^4", - "symfony/filesystem": "^2.5|^3|^4" + "symfony/console": "^2.8|^3|^4|^5", + "symfony/filesystem": "^2.5|^3|^4|^5" }, "bin": [ "scripts/release" @@ -522,17 +423,17 @@ "MIT" ], "authors": [ - { - "name": "Greg Anderson", - "email": "greg.1.anderson@greenknowe.org" - }, { "name": "Alexander Menk", "email": "menk@mestrona.net" + }, + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" } ], "description": "Provides a self:update command for Symfony Console applications.", - "time": "2018-10-28T01:52:03+00:00" + "time": "2020-04-13T02:49:20+00:00" }, { "name": "container-interop/container-interop", @@ -563,6 +464,7 @@ ], "description": "Promoting the interoperability of container objects (DIC, SL, etc.)", "homepage": "https://github.com/container-interop/container-interop", + "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, { @@ -663,16 +565,16 @@ }, { "name": "glpi-project/tools", - "version": "0.1.8", + "version": "0.1.13", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897" + "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/39ca503a00454e6c5d7d97bd8baff358d262a897", - "reference": "39ca503a00454e6c5d7d97bd8baff358d262a897", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/2028ecf9acd8b838cff37771dcab77ced9391f41", + "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41", "shasum": "" }, "require": { @@ -709,7 +611,7 @@ "plugins", "tools" ], - "time": "2019-06-07T09:46:17+00:00" + "time": "2020-06-19T10:29:26+00:00" }, { "name": "grasmash/expander", @@ -1011,16 +913,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -1054,20 +956,20 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.4", + "version": "3.5.5", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "dceec07328401de6211037abbb18bda423677e26" + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", - "reference": "dceec07328401de6211037abbb18bda423677e26", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", "shasum": "" }, "require": { @@ -1105,29 +1007,33 @@ "phpcs", "standards" ], - "time": "2020-01-30T22:20:29+00:00" + "time": "2020-04-17T01:09:41+00:00" }, { "name": "symfony/console", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12" + "reference": "326b064d804043005526f5a0494cfb49edb59bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", - "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", + "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0", + "reference": "326b064d804043005526f5a0494cfb49edb59bb0", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1|^2" }, "conflict": { "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", "symfony/process": "<3.3" }, "provide": { @@ -1135,11 +1041,12 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/event-dispatcher": "^4.3", + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { "psr/log": "For using the console logger", @@ -1150,7 +1057,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1177,41 +1084,69 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2020-01-10T07:52:48+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T20:06:45+00:00" }, { - "name": "symfony/debug", - "version": "v3.4.37", + "name": "symfony/event-dispatcher", + "version": "v4.4.10", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/70dd18e93bb8bdf3c4db7fde832619fef9828cf8", - "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866", + "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" + "php": ">=7.1.3", + "symfony/event-dispatcher-contracts": "^1.1" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/dependency-injection": "<3.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" }, "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" + "psr/log": "~1.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/stopwatch": "^3.4|^4.0|^5.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\EventDispatcher\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -1231,54 +1166,55 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2020-01-08T16:36:15+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T08:37:50+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v3.4.37", + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.7", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8" + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/79ede8f2836e5ec910ebb325bde40f987244baa8", - "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18", + "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" - }, - "conflict": { - "symfony/dependency-injection": "<3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" + "php": "^7.1.3" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "1.1-dev" } }, "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Contracts\\EventDispatcher\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1286,40 +1222,48 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Generic abstractions related to dispatching event", "homepage": "https://symfony.com", - "time": "2020-01-04T12:05:51+00:00" + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-09-17T09:54:03+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628" + "reference": "b27f491309db5757816db672b256ea2e03677d30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0a0d3b4bda11aa3a0464531c40e681e184e75628", - "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b27f491309db5757816db672b256ea2e03677d30", + "reference": "b27f491309db5757816db672b256ea2e03677d30", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1346,29 +1290,43 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2020-01-17T08:50:08+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T18:50:54+00:00" }, { "name": "symfony/finder", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f" + "reference": "5729f943f9854c5781984ed4907bbb817735776b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", - "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", + "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b", + "reference": "5729f943f9854c5781984ed4907bbb817735776b", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1395,20 +1353,34 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2020-01-01T11:03:25+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", "shasum": "" }, "require": { @@ -1420,7 +1392,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1453,20 +1429,34 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.17.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "7110338d81ce1cbc3e273136e4574663627037a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", + "reference": "7110338d81ce1cbc3e273136e4574663627037a7", "shasum": "" }, "require": { @@ -1478,7 +1468,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -1512,29 +1506,199 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.17.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", + "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.17.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "shasum": "" + }, + "require": { + "php": ">=7.0.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-06-06T08:46:27+00:00" }, { "name": "symfony/process", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a" + "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/5b9d2bcffe4678911a4c941c00b7c161252cf09a", - "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a", + "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5", + "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1561,31 +1725,103 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2020-01-01T11:03:25+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-30T20:06:45+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v1.1.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "psr/container": "^1.0" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-10-14T12:27:06+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.37", + "version": "v4.4.10", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "aa46bc2233097d5212332c907f9911533acfbf80" + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/aa46bc2233097d5212332c907f9911533acfbf80", - "reference": "aa46bc2233097d5212332c907f9911533acfbf80", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", + "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1593,7 +1829,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1620,7 +1856,21 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2020-01-13T08:00:59+00:00" + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-05-20T08:37:50+00:00" } ], "aliases": [], @@ -1628,9 +1878,12 @@ "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": "^7.2" + }, "platform-dev": [], "platform-overrides": { - "php": "5.6" - } + "php": "7.2.0" + }, + "plugin-api-version": "1.1.0" } diff --git a/hook.php b/hook.php index f574f29..014118a 100644 --- a/hook.php +++ b/hook.php @@ -60,17 +60,18 @@ function plugin_uninstall_addDefaultWhere($itemtype) { // ** Install / Uninstall plugin ** function plugin_uninstall_install() { + $dir = Plugin::getPhpDir('uninstall'); $plugin_infos = plugin_version_uninstall(); $migration = new Migration($plugin_infos['version']); //Plugin classes are not loaded when plugin is not activated : force class loading - require_once (GLPI_ROOT . "/plugins/uninstall/inc/uninstall.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/profile.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/preference.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/model.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/replace.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/config.class.php"); + require_once ($dir . "/inc/uninstall.class.php"); + require_once ($dir . "/inc/profile.class.php"); + require_once ($dir . "/inc/preference.class.php"); + require_once ($dir . "/inc/model.class.php"); + require_once ($dir . "/inc/replace.class.php"); + require_once ($dir . "/inc/config.class.php"); PluginUninstallProfile::install($migration); PluginUninstallModel::install($migration); @@ -81,13 +82,14 @@ function plugin_uninstall_install() { function plugin_uninstall_uninstall() { - - require_once (GLPI_ROOT . "/plugins/uninstall/inc/uninstall.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/profile.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/preference.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/model.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/replace.class.php"); - require_once (GLPI_ROOT . "/plugins/uninstall/inc/config.class.php"); + $dir = Plugin::getPhpDir('uninstall'); + + require_once ($dir . "/inc/uninstall.class.php"); + require_once ($dir . "/inc/profile.class.php"); + require_once ($dir . "/inc/preference.class.php"); + require_once ($dir . "/inc/model.class.php"); + require_once ($dir . "/inc/replace.class.php"); + require_once ($dir . "/inc/config.class.php"); PluginUninstallProfile::uninstall(); PluginUninstallModel::uninstall(); diff --git a/inc/model.class.php b/inc/model.class.php index ad2cc0a..4c4ec0d 100644 --- a/inc/model.class.php +++ b/inc/model.class.php @@ -64,7 +64,8 @@ static function getMenuContent() { // get Menu name : $menu['title'] = __("Item's Lifecycle", 'uninstall'); - $menu['page'] = '/plugins/uninstall/front/model.php'; + $menu['page'] = '/' . Plugin::getWebDir('uninstall', false) . '/front/model.php'; + $menu['icon'] = self::getIcon(); if (Session::haveRight(PluginUninstallProfile::$rightname, READ)) { @@ -1370,4 +1371,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT return; } + static function getIcon() { + return "fas fa-recycle"; + } } diff --git a/inc/replace.class.php b/inc/replace.class.php index 6702853..1a04838 100644 --- a/inc/replace.class.php +++ b/inc/replace.class.php @@ -703,7 +703,7 @@ static function showForm($type, $model_id, $tab_ids, $location) { $type::dropdown([ 'name' => "newItems[$id]", 'displaywith' => ['serial', 'otherserial'], - 'url' => $CFG_GLPI['root_doc']."/plugins/uninstall/ajax/dropdownReplaceFindDevice.php", + 'url' => Plugin::getWebDir('uninstall')."/ajax/dropdownReplaceFindDevice.php", 'used' => array_keys($tab_ids[$type]) ]); echo ""; @@ -887,7 +887,7 @@ static function getAssociatedItems(Computer $comp) { foreach ($UNINSTALL_DIRECT_CONNECTIONS_TYPE as $itemtype) { $item = new $itemtype(); if ($item->canView()) { - $datas = getAllDatasFromTable('glpi_computers_items', + $datas = getAllDataFromTable('glpi_computers_items', ['computers_id' => $ID, 'itemtype' => $itemtype]); foreach ($datas as $computer_item) { $data[$itemtype][] = $computer_item; diff --git a/inc/uninstall.class.php b/inc/uninstall.class.php index 7b5e133..e9f4568 100644 --- a/inc/uninstall.class.php +++ b/inc/uninstall.class.php @@ -85,7 +85,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK); } } - Html::redirect($CFG_GLPI["root_doc"] . '/plugins/uninstall/front/action.php?device_type=' . + Html::redirect(Plugin::getWebDir('uninstall') . '/front/action.php?device_type=' . $itemtype . "&model_id=" . $_POST["model_id"]); return; break; @@ -217,10 +217,6 @@ static function uninstall($type, $model_id, $tab_ids, $location) { } } - if ($item->isField('domains_id') && $model->fields["raz_domain"]) { - $fields["domains_id"] = 0; - } - //RAZ network if ($item->isField('networks_id') && ($model->fields["raz_network"] == 1)) { $fields["networks_id"] = 0; @@ -261,6 +257,11 @@ static function uninstall($type, $model_id, $tab_ids, $location) { } } + if ($model->fields["raz_domain"]) { + $domain_item = new Domain_Item(); + $domain_item->cleanDBonItemDelete($type, $id); + } + //Delete machine from glpi_ocs_link if ($type == 'Computer') { //Delete computer's volumes @@ -657,7 +658,7 @@ static function showFormUninstallation($ID, $item, $user_id) { $type = $item->getType(); // TODO review this to pass arg in form, not in URL. - echo "
"; echo ""; echo ""; @@ -674,7 +675,7 @@ static function showFormUninstallation($ID, $item, $user_id) { 'users_id' => $_SESSION["glpiID"]]; Ajax::updateItemOnSelectEvent("dropdown_model_id$rand", "show_objects", - $CFG_GLPI["root_doc"] . "/plugins/uninstall/ajax/locations.php", + Plugin::getWebDir('uninstall') . "/ajax/locations.php", $params); echo ""; @@ -774,7 +775,7 @@ static function dropdownFieldAction($name, $entity = 0, $entity_sons = [], $valu 'entity_sons' => $entity_sons]; Ajax::updateItemOnSelectEvent("dropdown__" . $name . "_action".$rand, "show_".$ajax_page, - $CFG_GLPI["root_doc"]."/plugins/uninstall/ajax/$ajax_page.php", + Plugin::getWebDir('uninstall')."/ajax/$ajax_page.php", $params); return $action; } @@ -795,7 +796,7 @@ static function getAllTemplatesByEntity($entity, $add_entity = false) { ORDER BY `name`"; $result = $DB->query($query); - while ($datas = $DB->fetch_array($result)) { + while ($datas = $DB->fetchArray($result)) { $templates[$datas["id"]] = ($add_entity ? Dropdown::getDropdownName("glpi_entities", $datas["entities_id"]) . " > " diff --git a/setup.php b/setup.php index e014597..92e933b 100644 --- a/setup.php +++ b/setup.php @@ -28,12 +28,12 @@ @since 2009 ---------------------------------------------------------------------- */ -define ('PLUGIN_UNINSTALL_VERSION', '2.6.3'); +define ('PLUGIN_UNINSTALL_VERSION', '2.7.0'); // Minimal GLPI version, inclusive -define("PLUGIN_UNINSTALL_MIN_GLPI", "9.3"); +define("PLUGIN_UNINSTALL_MIN_GLPI", "9.5"); // Maximum GLPI version, exclusive -define("PLUGIN_UNINSTALL_MAX_GLPI", "9.5"); +define("PLUGIN_UNINSTALL_MAX_GLPI", "9.6"); /** * Function Init @@ -110,7 +110,7 @@ function plugin_version_uninstall() { return [ 'name' => __("Item's Lifecycle (uninstall)", 'uninstall'), 'author' => 'Walid Nouh, François Legastelois, Remi Collet', - 'license' => 'GPLv2+', + 'license' => "GPLv2+", 'homepage' => 'https://github.com/pluginsGLPI/uninstall', 'version' => PLUGIN_UNINSTALL_VERSION, 'license' => 'GPLv2+', @@ -123,30 +123,3 @@ function plugin_version_uninstall() { ] ]; } - -function plugin_uninstall_check_prerequisites() { - - //Version check is not done by core in GLPI < 9.2 but has to be delegated to core in GLPI >= 9.2. - if (!method_exists('Plugin', 'checkGlpiVersion')) { - $version = preg_replace('/^((\d+\.?)+).*$/', '$1', GLPI_VERSION); - $matchMinGlpiReq = version_compare($version, PLUGIN_UNINSTALL_MIN_GLPI, '>='); - $matchMaxGlpiReq = version_compare($version, PLUGIN_UNINSTALL_MAX_GLPI, '<'); - - if (!$matchMinGlpiReq || !$matchMaxGlpiReq) { - echo vsprintf( - 'This plugin requires GLPI >= %1$s and < %2$s.', - [ - PLUGIN_UNINSTALL_MIN_GLPI, - PLUGIN_UNINSTALL_MAX_GLPI, - ] - ); - return false; - } - } - - return true; -} - -function plugin_uninstall_check_config($verbose = false) { - return true; -} diff --git a/uninstall.xml b/uninstall.xml index f262c8b..6118d47 100644 --- a/uninstall.xml +++ b/uninstall.xml @@ -26,9 +26,9 @@ - 2.7.0-rc1 + 2.7.0 ~9.5.0 - https://github.com/pluginsGLPI/uninstall/releases/download/2.7.0-rc1/glpi-uninstall-2.7.0-rc1.tar.bz2 + https://github.com/pluginsGLPI/uninstall/releases/download/2.7.0/glpi-uninstall-2.7.0.tar.bz2 2.6.3 From 37930631fc5b4e55e93d20919919c7982863868c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Sun, 5 Jul 2020 13:40:12 +0200 Subject: [PATCH 2/3] Add Croatian (Croatia) locale --- locales/hr_HR.mo | Bin 0 -> 5637 bytes locales/hr_HR.po | 307 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 307 insertions(+) create mode 100644 locales/hr_HR.mo create mode 100644 locales/hr_HR.po diff --git a/locales/hr_HR.mo b/locales/hr_HR.mo new file mode 100644 index 0000000000000000000000000000000000000000..aa6e29113f94b6ab8bb8801ec523900a5a3fd214 GIT binary patch literal 5637 zcma)QaS;tN?ld$nhu%U;KQ zIfpjH5FbR01Wh!GiI^eA2>JwxiNu*`GEGR-gy;*A1QTL>5@Sq!Fh1z-Tl;d(+>AS2 z{qMc@x4!jV{@=IPdF$pq-%(u4jN2H;u2sr_Pwe5JT-Pb}0pJ?&ec(;t&EW0eEnpqI z0XzzR1Y8I21l!>I!Eb_}0G|gn_$v58@J(hn+b`wA#= zdk&Pm{RCu7bsjtbz6Q>Ml4Obdeo*{<6qI;=2^9aH24&s%LDBakP~=_#e{+pezXOFY z&+$^^Uj)UkS3%kLHBjEa1xmjD21?woXHw=T`6vD!28A~ppsf2cI1YXr6!~+YiV8tqsXoY``YQi!0>2A>2z(I~J?B8t^G8tlw+EqVa33gqcodX4 z3_#iES+EBFymUi`~{Ra-ipz6@J>+tIs=Nmo1nz!X;9+#GWam~1}Hq-i&2uNdqCmMA}I5l;4J7s z;m-@8*!L1B_WcqRKmGuU{NKTcz<+_0;9-pXBp8AcpQk|4|3gsX@oP~0`aLN2{|OYi zcR=XkuLJy-*o$Aw4B7WxjC&cMW5|B@F~q(p#vz96Dc51fJq(HAgABPOF5)Y$tAmWs zFeLWEC$_!llH877V&f9ye#W&7iG^GX49TO!;IjnNwLb^XSIxb|p}eGq z_b~1#CqRiaW$5`Ou@iokm(-lprNmY);ly=}2N*L9;XEl(`xp}6+Zp9G&&?6WVlgoX z3P+$6FB)m+BF*1c?6RIZ5(GN6-CoC}Rvtom9hr{a3~eV!)RE0i+emflw9%0rl&gBZ z&bIElz;@J;xX}#zR=Z8@I)Uz@C=N|IA4XfcYtyC+L?CS*XQ3$EL>QCdzcdq;GylWm2O z4kMIfqv$Cm8m`;Ru$q^8IZJr867|vG;_WMmoLE?2JzBo#gi$-UXH?5YB8l5f2PU?< z8787rkC&p!M5#ssGibU_C8QR^SOVV|x~-PFy>wf5T*I5MmSU4w9hlT4>ZpxuOx7-P zZ)L>SGLAknD-zo<(UBYIEDEC}HJy$P)K%tl|9rOfT}dugq$SWB+XXXRWdFyjtLqSk z7#ImHN)`JOeJq4`+l@}Hb96$FS0+#R4S89{M4L^?qY-*~=6QySTbBz}T1q8_OFlx6 zSlb(+l7EC9lBPx$$B?6_1plTN+kWV>p&e>y{;?um8lg?gN(iowo5*b0s_+uET9uaE z3HSX}lx*8I$Zv*Y4lZV!Kos~rv=N+j)UF0K(T`zEhNGhUeHsXc!nL^StYvf)hSpzmC zn^~t25zb0Mt96S%X=)lxYzSN<^J~|eE>0U+ny6DvijxOmlODES? zPOOd*ZemtDo@|9d?V)Tdshx6jdTi}P?IblTYif(|Y);S4)DP5V>b05udUkfMK6CF3 z*Vr+Wq&4pYA4nI^>2BC@sn~wFYr@Wh<>ORf@1I1+tSpJPGOD|F%9`$+UWgrj(BQ_4 zy9qtsOw(R6H$6QV45m^E5Y6uKDY7-4+D0eb08BTTo;^5o-|TcVe(d3s(-ULISB@_Y z{j5*TjPXfKNkdIyIY%>jJe`J_VRT40nkG(cI)D1qa_!(yuE<4gDQdU?X3Xh>8(~^m zJg5C$W0V}Tt*SZChE(sxx-SYPvJ}I$?LXY1lPt zWoIJ}ch818WT{jTd$&er^Y69aCBXl*ZS>nuKEEa&zy0J7hJrEXXB^V#b(bAjsy#-9 zd;_axLk&He+fEcVGEA)myQsU8Bwi<}mSYT`5TnP-1%~f$>5&-S$;eLMOY6Q&5@&%j1?*AcjWtF8qh#(57dZAUQcF%=YlPP^of zx!SxQA91ZUp^g=Ss}{ohHb?j#d?!jRNG=riKANjakLX0Yif}<@nF!+D^OumboXm8} z*(FP1UgTQ7-ok1HD&&M8Wo3%9OFUC+QV;#MEd{JP-Gd+yyDIXt4JnaTN5M)9@V8;< zaXw!XsGRjOPGTGp@QRkj`KRQ#x#StT$q8P#>TAHNbxBgGRFdDzt8}Cu$N2#xxulPj z0V|qMm>-lzI|Y5{!ZWsQT9eWmJdd%D5K8tlYWl})Qi+s#@wEYME)nD;g2^N4Tr?s;kdfota{CUSY<83L;~{Ys~Hc@HlOCu`9F zP1i{(EBZ)V7kfH}PCj&Tv?=&x8}0hgfeeeY5|AM`Muia&j}R=WbIIFcx#o9){9Zvy qW?W*b4@}#|{C4EGxjGXQI}uX17y1NmPrdovCI literal 0 HcmV?d00001 diff --git a/locales/hr_HR.po b/locales/hr_HR.po new file mode 100644 index 0000000..cfb2ceb --- /dev/null +++ b/locales/hr_HR.po @@ -0,0 +1,307 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +# Translators: +# milotype , 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"PO-Revision-Date: 2017-01-03 22:10+0000\n" +"Last-Translator: milotype , 2020\n" +"Language-Team: Croatian (Croatia) (https://www.transifex.com/teclib/teams/28042/hr_HR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"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" + +#: front/action.php:55 inc/replace.class.php:476 +msgid "Replacement successful" +msgstr "Zamjena uspješna" + +#: front/action.php:96 inc/uninstall.class.php:324 +msgid "Uninstallation successful" +msgstr "Deinstalacija uspješna" + +#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 +msgid "Keep previous location" +msgstr "Zadrži prethodnu lokaciju" + +#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 +msgid "Empty location" +msgstr "Prazna lokacija" + +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Deinstaliraj" + +#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +msgid "Item's Lifecycle" +msgstr "Životni vijek predmeta" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Prečaci" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Postavke lokacije" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Zamijeni padajući popis stanja s radnjama dodatka" + +#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +msgid "Uninstallation" +msgstr "Deinstalacija" + +#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/replace.class.php:61 inc/replace.class.php:108 +msgid "Replacement" +msgstr "Zamjena" + +#: inc/model.class.php:118 +msgid "PDF Archiving" +msgstr "PDF arhiviranje" + +#: inc/model.class.php:120 +msgid "CSV Archiving" +msgstr "CSV arhiviranje" + +#: inc/model.class.php:123 +msgid "Purge" +msgstr "Izbriši" + +#: inc/model.class.php:124 +msgid "Delete + Comment" +msgstr "Izbriši i komentiraj" + +#: inc/model.class.php:125 +msgid "Keep + Comment" +msgstr "Zadrži i komentiraj" + +#: inc/model.class.php:166 +msgid "Replacing data" +msgstr "Zamjenjivanje podataka" + +#: inc/model.class.php:210 inc/model.class.php:829 +msgid "Type of template" +msgstr "Vrsta predloška" + +#: inc/model.class.php:219 inc/model.class.php:793 +msgid "Transfer's model to use" +msgstr "Model prijenosa koji se koristiti" + +#: inc/model.class.php:239 inc/replace.class.php:603 +msgid "New status of the computer" +msgstr "Novo stanje računala" + +#: inc/model.class.php:251 inc/model.class.php:839 +msgid "Action on group" +msgstr "Radnja na grupu" + +#: inc/model.class.php:263 +msgid "New group" +msgstr "Nova grupa" + +#: inc/model.class.php:284 +msgid "Add template" +msgstr "Dodaj predložak" + +#: inc/model.class.php:287 +msgid "Manage templates" +msgstr "Upravljaj predlošcima" + +#: inc/model.class.php:298 +msgid "Erase datas" +msgstr "Izbriši podatke" + +#: inc/model.class.php:301 inc/model.class.php:701 +msgid "Delete software history (computers)" +msgstr "Izbriši povijest softvera (računala)" + +#: inc/model.class.php:306 inc/model.class.php:859 +msgid "Delete the whole history" +msgstr "Izbriši cijelu povijest" + +#: inc/model.class.php:388 inc/model.class.php:438 +msgid "Informations replacement" +msgstr "Zamjena informacija" + +#: inc/model.class.php:389 inc/replace.class.php:549 +msgid "General informations" +msgstr "Opće informacije" + +#: inc/model.class.php:411 inc/replace.class.php:564 +msgid "Overwrite informations (from old item to the new)" +msgstr "Prepiši informacije (od starog predmeta na novi)" + +#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +msgid "Archiving method of the old material" +msgstr "Način arhiviranja starog materijala" + +#: inc/model.class.php:428 +msgid "Plugin PDF is installed and activated" +msgstr "PDF dodatak je instaliran i aktiviran" + +#: inc/model.class.php:431 +msgid "" +"Plugin PDF is not installed, you won't be able to use PDF format for " +"archiving" +msgstr "" +"PDF dodatak još nije instaliran, arhiviranje u PDF formatu nije moguće" + +#: inc/model.class.php:439 inc/replace.class.php:625 +msgid "Connections with other materials" +msgstr "Veze s ostalim materijalima" + +#: inc/model.class.php:513 inc/replace.class.php:660 +msgid "Direct connections" +msgstr "Izravne veze" + +#: inc/model.class.php:586 +msgid "OCSNG link" +msgid_plural "OCSNG links" +msgstr[0] "OCSNG poveznica" +msgstr[1] "OCSNG poveznice" +msgstr[2] "OCSNG poveznice" + +#: inc/model.class.php:588 +msgid "These options only apply to computers coming from OCSNG" +msgstr "Ove se opcije primjenjuju samo na računala koja dolaze iz OCSNG-a" + +#: inc/model.class.php:592 inc/model.class.php:812 +msgid "Delete computer in OCSNG" +msgstr "Izbriši računalo u OCSNG-u" + +#: inc/model.class.php:598 inc/model.class.php:820 +msgid "Delete link with computer in OCSNG" +msgstr "Izbriši poveznicu s računalom u OCSNG-u" + +#: inc/model.class.php:612 +msgid "Delete computer in FusionInventory" +msgstr "Izbriši računalo u FusionInventory" + +#: inc/model.class.php:624 +msgid "Additionnal fields" +msgstr "Dodatna polja" + +#: inc/model.class.php:628 +msgid "Delete Fields plugin informations" +msgstr "Izbriši informacije dodatka „Polja”" + +#: inc/model.class.php:993 inc/uninstall.class.php:762 +msgid "Keep in the current group" +msgstr "Zadrži u trenutačnoj grupi" + +#: inc/preference.class.php:54 +msgid "Item's location after uninstall" +msgstr "Lokacija predmeta nakon deinstaliranja" + +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Pričekaj, deinstalacija je u tijeku …" + +#: inc/uninstall.class.php:545 +msgid "Item is now uninstalled" +msgstr "Predmet je sada deinstaliran" + +#: inc/uninstall.class.php:547 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Predmet je sada deinstaliran s modelom %s" + +#: inc/uninstall.class.php:553 +msgid "Item replaced by a new one" +msgstr "Predmet je zamijenjen jednim novim" + +#: inc/uninstall.class.php:555 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Predmet je zamijenjen jednim novim s modelom %s" + +#: inc/uninstall.class.php:561 +msgid "Item replacing an old one" +msgstr "Predmet zamijenjuje jedan stari" + +#: inc/uninstall.class.php:566 +msgid "Removed from OCSNG with ID" +msgstr "Uklonjeno iz OCSNG-a s ID oznakom" + +#: inc/uninstall.class.php:663 +msgid "Apply model" +msgstr "Primijeni model" + +#: inc/uninstall.class.php:680 +msgid "Item's location after applying model" +msgstr "Lokacija predmeta nakon primjenjivanja modela" + +#: inc/uninstall.class.php:763 +msgid "Affect to a new group" +msgstr "Utjecaj na novu grupu" + +#: inc/uninstall.class.php:815 +msgid "Lifecycle" +msgstr "Životni vijek" + +#: inc/replace.class.php:40 +msgid "Item's replacement" +msgstr "Zamjena predmeta" + +#: inc/replace.class.php:65 +msgid "Please wait, replacement is running..." +msgstr "Pričekaj, zamjena je u tijeku …" + +#: inc/replace.class.php:130 +msgid "This document is the archive of this replaced item" +msgstr "Predmet je arhiva ovog zamijenjenog predmeta" + +#: inc/replace.class.php:135 +msgid "Archive of old material" +msgstr "Arhiva starog materijala" + +#: inc/replace.class.php:409 +msgid "See attached document" +msgstr "Pogledaj priloženi dokument" + +#: inc/replace.class.php:498 +msgid "This item is a replacement for item" +msgstr "Predmet je zamjena za predmet" + +#: inc/replace.class.php:500 +msgid "This item was replaced by" +msgstr "Predmet je zamijenjen s" + +#: inc/replace.class.php:548 inc/replace.class.php:624 +msgid "Reminder of the replacement model" +msgstr "Podsjetnik modela zamjene" + +#: inc/replace.class.php:586 +msgid "New location of item" +msgstr "Nova lokacija predmeta" + +#: inc/replace.class.php:671 +msgid "Choices for item to replace" +msgstr "Opcije za predmet koji se zamijenjuje" + +#: inc/replace.class.php:674 +msgid "Old item" +msgstr "Stari predmet" + +#: inc/replace.class.php:684 +msgid "New item" +msgstr "Novi predmet" + +#: inc/replace.class.php:719 +msgid "Replace" +msgstr "Zamijeni" + +#: setup.php:111 +msgid "Item's Lifecycle (uninstall)" +msgstr "Životni vijek predmeta (deinstaliraj)" From 354b0befbcaab1dd70c6052877d8d9a52b4bc122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Sun, 5 Jul 2020 13:40:54 +0200 Subject: [PATCH 3/3] Update locales --- locales/cs_CZ.mo | Bin 5834 -> 5793 bytes locales/cs_CZ.po | 210 ++++++++++++++++++++--------------------- locales/en_GB.mo | Bin 5368 -> 5327 bytes locales/en_GB.po | 212 +++++++++++++++++++++--------------------- locales/en_US.mo | Bin 5450 -> 5409 bytes locales/en_US.po | 210 ++++++++++++++++++++--------------------- locales/fr_FR.mo | Bin 5861 -> 5820 bytes locales/fr_FR.po | 210 ++++++++++++++++++++--------------------- locales/hr_HR.po | 210 ++++++++++++++++++++--------------------- locales/ko_KR.mo | Bin 5475 -> 5434 bytes locales/ko_KR.po | 210 ++++++++++++++++++++--------------------- locales/pl_PL.mo | Bin 5013 -> 4972 bytes locales/pl_PL.po | 210 ++++++++++++++++++++--------------------- locales/pt_BR.mo | Bin 4965 -> 4924 bytes locales/pt_BR.po | 210 ++++++++++++++++++++--------------------- locales/pt_PT.mo | Bin 5721 -> 5680 bytes locales/pt_PT.po | 210 ++++++++++++++++++++--------------------- locales/ru_RU.mo | Bin 2839 -> 2798 bytes locales/ru_RU.po | 210 ++++++++++++++++++++--------------------- locales/tr_TR.mo | Bin 5618 -> 5577 bytes locales/tr_TR.po | 210 ++++++++++++++++++++--------------------- locales/uninstall.pot | 206 ++++++++++++++++++++-------------------- locales/zh_CN.mo | Bin 4422 -> 4381 bytes locales/zh_CN.po | 210 ++++++++++++++++++++--------------------- 24 files changed, 1364 insertions(+), 1364 deletions(-) diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index 38b002671679d641b7e246961a44ad582d880755..1c6e9858a3488990bec987154106b94c845815ed 100644 GIT binary patch delta 579 zcmXZYKPD0kQLd2wL zg2~XBBt+89MiU8(#EyPne!t{$pL=)r^6uWFeQIBCw3}v|$WxCJ#DHiK&gmDiw@z9G;khe({ z`|#e|f59m62RdkRs1IF28+UL5OQ;1eQ6F5#8T|6j!y)4qTnxDn*u)qYvKYk!q=sDJ zAl@QFo|*LLZ>XL5M(xZW>b(fRNMj1wk{mi%K+U^Ct#fBsXv-v&VYNdf@8$z zs4aXzAAaHr{$LlTXrC5dMlHCFnwLilOSp!|IEM|?&d+PsD2oJY!YXRZv!1)yO}vjo PcvLHPlzp|dztY(PRKhz4 delta 618 zcmXZYJ4ixd6u|Kh3p5{T+S{nx1GVhJ^%_`04HXU15YZw{mJSUSlmyjq*9Hq3bE+j; z3`yD>nu>~ObE&2VX^z05|3T&A@0{;`hjZ?^)F1WIlFf44lzMh6E+d z#ZLT09`(zge7TcpWi#CLRopf;W@g< yudoYm%LmP8j?k(;x0_ApHg~r5`E)Lu)J!8br5g#|nABqNq-jPCer3C-(DDyzuR{a? diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index 539a765..07be3c8 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: Pavel Borecki , 2018\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n" @@ -21,136 +21,116 @@ 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:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Odinstalovat" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Nahrazení úspěšné" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Odinstalace úspěšná" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Ponechat předchozí umístění" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Prázdné umístění" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Odinstalovat" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Životní cyklus položky" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Zkratky" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Preference umístění" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Nahradit rozbalovací nabídku stavu akcí zásuvného modulu" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Odinstalace" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Nahrazení" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF archivace" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV archivace" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Trvale smazat" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Smazat + komentovat" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Ponechat + komentovat" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Nahrazují se data" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Typ šablony" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Model přenosu který použít" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Nový stav počítače" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Akce na skupině" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Nová skupina" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Přidat šablonu" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Spravovat šablony" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Vymazat data" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Smazat historii software (počítače)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Smazat celou historii" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Nahrazení informací" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Obecné informace" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Přepsat informace (z původní položky do nové)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Metoda archivace původního materiálu" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Zásuvný modul pro PDF je nainstalovaný a zapnutý" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -158,15 +138,15 @@ msgstr "" "Zásuvný modul pro PDF není nainstalován, proto nebude možné pro archivaci " "použít PDF formát" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Propojení s ostatními materiály" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Přímá propojení" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG odkaz" @@ -174,31 +154,31 @@ msgstr[1] "OCSNG odkazy" msgstr[2] "OCSNG odkazů" msgstr[3] "OCSNG odkazy" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "Tyto volby jsou uplatněny pouze na počítače pocházející z OCSNG" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Smazat počítač v OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Smazat propojení s počítačem v OCSNG" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Smazat počítač ve FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Další kolonky" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Smazat informace zásuvného modulu Kolonky" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Ponechat ve stávající skupině" @@ -206,51 +186,13 @@ msgstr "Ponechat ve stávající skupině" msgid "Item's location after uninstall" msgstr "Umístění položky po odinstalaci" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Čekejte, probíhá odinstalace…" - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Položka je nyní odinstalovaná" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Položka je nyní odinstalována pomocí modelu %s" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Položka je nahrazena novou" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Položka nahrazena za novou pomocí modelu %s" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Položka nahrazující tu původní" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Odebráno z OCSNG s identifikátorem" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Uplatnit model" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Umístění položky po uplatnění modelu" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Přiřadit do nové skupiny" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Ponechat předchozí umístění" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Životní cyklus" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Prázdné umístění" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -304,6 +246,64 @@ msgstr "Nová položka" msgid "Replace" msgstr "Nahradit" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Čekejte, probíhá odinstalace…" + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Položka je nyní odinstalovaná" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Položka je nyní odinstalována pomocí modelu %s" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Položka je nahrazena novou" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Položka nahrazena za novou pomocí modelu %s" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Položka nahrazující tu původní" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Odebráno z OCSNG s identifikátorem" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Uplatnit model" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Umístění položky po uplatnění modelu" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Přiřadit do nové skupiny" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Životní cyklus" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Zkratky" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Preference umístění" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Nahradit rozbalovací nabídku stavu akcí zásuvného modulu" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Životní cyklus položky (odinstalace)" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index fbbd89786c357207ee03fafd5a749a02a5d83fbe..430feb045cd19050dec78e207216b93d6f4ae2fc 100644 GIT binary patch delta 594 zcmXZZ&nv@m9LMpGjrJX8U&iKF`TCiW>}%GdTvuxCvK$*7`o)pYP}U{=7f$_kNRa$=iIu%QP7C(rQf97!zzWhS0>Y z10C$bG`8R(CU6Nya2+FfjD2{H4&I}UH5|lG973BS-IzwL^HJlOVS){Rql7AajpUdI zRN+_b#1GT~U#N>%R2fAFdohROxPm>nkNixTM?Y3k7k|eA{IR`y!9;t#-~=jh4&zwF zFs`94u!TBs&wqb{7VEOVe}lTn6Dq&v?|-Aq`VTd+X}TQ41&<&}u!`#B5DR#RO&E;T zM;JyOJc%L9q4El-32mba?xH4liu&uWPz^j{7N2nj19YRwyBPv?yo?&@CaS{&RN@)x gz)RG3)yhuekyT1Z;?3EqRK{`L`Po#Z7`X`j15gz>$p8QV delta 653 zcmZ|MJ4ixN7{Kwbp=+1R{hfQyIp24_?-qPNzKiL~Y^*}5e1lRBrBt9% zDTZnsn=y=S7{z)_qYJlj5D(FgH`s-b=)pH^LJL9r(1rathHi|O-`5-}s|NURRGzp+ zN&Jk&Q12*-zp)joh$;cxCPI7Z*h8u0 z8fWkoYcSAKYN3e|ID%G8q3qj0>Ch=k!gG|)-J|@vCzJv{Fo<7hqMvG{^G1w;RJ?=I z(qohguTVBVpad+StSja=tM_f;h&Gu{#52j%iZ&I`BtjljH+4-nH9hDt^pG*?*SYHE SX0`dmdUEyub-5Ayne`8-wM;Dl diff --git a/locales/en_GB.po b/locales/en_GB.po index 43ef174..9ec44eb 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 10:16+0000\n" -"PO-Revision-Date: 2020-02-07 10:16+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" +"PO-Revision-Date: 2020-07-05 11:40+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -17,136 +17,116 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Uninstall" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Replacement successful" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Uninstallation successful" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Keep previous location" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Empty location" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Uninstall" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Item's Lifecycle" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Shortcuts" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Location preferences" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Replace status dropdown by plugin actions" - -#: inc/model.class.php:106 inc/model.class.php:987 inc/model.class.php:1029 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Uninstallation" -#: inc/model.class.php:108 inc/model.class.php:989 inc/model.class.php:1031 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Replacement" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF Archiving" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV Archiving" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Purge" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Delete + Comment" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Keep + Comment" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Replacing data" -#: inc/model.class.php:210 inc/model.class.php:830 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Type of template" -#: inc/model.class.php:219 inc/model.class.php:794 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Transfer's model to use" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "New status of the computer" -#: inc/model.class.php:251 inc/model.class.php:840 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Action on group" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "New group" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Add template" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Manage templates" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Erase datas" -#: inc/model.class.php:301 inc/model.class.php:702 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Delete software history (computers)" -#: inc/model.class.php:306 inc/model.class.php:860 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Delete the whole history" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Informations replacement" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "General informations" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Overwrite informations (from old item to the new)" -#: inc/model.class.php:418 inc/model.class.php:850 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Archiving method of the old material" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Plugin PDF is installed and activated" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -154,45 +134,45 @@ msgstr "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Connections with other materials" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Direct connections" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG link" msgstr[1] "OCSNG links" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "These options only apply to computers coming from OCSNG" -#: inc/model.class.php:592 inc/model.class.php:813 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Delete computer in OCSNG" -#: inc/model.class.php:598 inc/model.class.php:821 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Delete link with computer in OCSNG" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Delete computer in FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Additionnal fields" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Delete Fields plugin informations" -#: inc/model.class.php:994 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Keep in the current group" @@ -200,51 +180,13 @@ msgstr "Keep in the current group" msgid "Item's location after uninstall" msgstr "Item's location after uninstall" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Please wait, uninstallation is running..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Item is now uninstalled" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Item is now uninstalled with model %s" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Item replaced by a new one" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Item replaced by a new one with model %s" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Item replacing an old one" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Removed from OCSNG with ID" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Apply model" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Item's location after applying model" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Affect to a new group" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Keep previous location" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Lifecycle" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Empty location" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -298,6 +240,64 @@ msgstr "New item" msgid "Replace" msgstr "Replace" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Please wait, uninstallation is running..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Item is now uninstalled" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Item is now uninstalled with model %s" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Item replaced by a new one" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Item replaced by a new one with model %s" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Item replacing an old one" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Removed from OCSNG with ID" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Apply model" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Item's location after applying model" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Affect to a new group" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Lifecycle" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Shortcuts" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Location preferences" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Replace status dropdown by plugin actions" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Item's Lifecycle (uninstall)" diff --git a/locales/en_US.mo b/locales/en_US.mo index b25ef30b6f3300e314eb02814b0df817f19d6c45..e27a134552e51457dc4345a6dce3f2b17a9a1d44 100644 GIT binary patch delta 579 zcmXZZyGsK>5XbQ`s5u`oFVFZ0_)0|67$4vtAR>r}g;v*FXlbKGI8up05j*Xog^dSy=e};lXjAo!y(+oxMikrtr8K@y|QV-uunsX66l;F|-3r;t{%7 z!9J{F1|KkouNcD?j$wckn5I|)mr?N=PT?L7<7pV*#?7~BChFlr3sb}qvZ-Y*_F@jx zIFCBOYN&^K;zJz8Yn;U=9Kj~?Simcb4qfTsc^t=$r2oI+J`>uogi1WaA-uyLe8E9{ zLlyiC=iBHI2jRL-uYz zL#%8iVqp}UO(XFK@ICRme9pPI=iYPftEV5+&Gl~Qwo9q!ex*W6soH>2gz5srSjQ1; zVIQ_Jif=fBUl_y)#p9@>j>|ZRJ8oXaDe_Ys#cMZz3MofTv(RxjB2-1lGsxL0kG;5o zL%4;~z@BRj6Xcf|!v~zjcN{}6QxGa0C(uG^ynvH<6n6eEJZC{JY@ih0poT9Pz)u{; zZ, 2019\n" "Language-Team: English (United States) (https://www.transifex.com/teclib/teams/28042/en_US/)\n" @@ -21,136 +21,116 @@ msgstr "" "Language: en_US\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Uninstall" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Replacement Successful" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Uninstallation Successful" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Keep previous location" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Empty location" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Uninstall" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Item's Lifecycle" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Shortcuts" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Location preferences" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Replace status dropdown by plugin actions" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Uninstallation" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Replacement" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF Archiving" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV Archiving" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Purge" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Delete + Comment" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Keep + Comment" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Replacing data" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Type of Template" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Transfer's model to use" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "New status of the computer" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Action on group" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "New Group" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Add Template" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Manage Templates" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Erase Data" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Delete Software History (Computers)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Delete the whole history" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Information Replacement" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "General Information" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Overwrite Information (from old item to the new)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Archiving method of the old material" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Plugin PDF is installed and activated" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -158,45 +138,45 @@ msgstr "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Connections with other materials" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Direct Connections" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG link" msgstr[1] "OCSNG links" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "These options only apply to computers coming from OCSNG" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Delete computer in OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Delete link with computer in OCSNG" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Delete computer in FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Additional Fields" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Delete Fields plugin information" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Keep in the current group" @@ -204,51 +184,13 @@ msgstr "Keep in the current group" msgid "Item's location after uninstall" msgstr "Item's location after uninstall" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Please wait, uninstallation is running..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Item is now uninstalled" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Item is now uninstalled with model %s" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Item replaced by a new one" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Item replaced by a new one with model %s" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Item replacing an old one" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Removed from OCSNG with ID" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Apply Model" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Item's location after applying model" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Affect to a new group" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Keep previous location" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Lifecycle" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Empty location" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -302,6 +244,64 @@ msgstr "New item" msgid "Replace" msgstr "Replace" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Please wait, uninstallation is running..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Item is now uninstalled" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Item is now uninstalled with model %s" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Item replaced by a new one" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Item replaced by a new one with model %s" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Item replacing an old one" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Removed from OCSNG with ID" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Apply Model" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Item's location after applying model" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Affect to a new group" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Lifecycle" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Shortcuts" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Location preferences" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Replace status dropdown by plugin actions" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Item's Lifecycle (uninstall)" diff --git a/locales/fr_FR.mo b/locales/fr_FR.mo index ebb79688de5d0290e1e015016c49cd8c6286b20d..dd63c245e6139c989dbe719112a36582ee00dd22 100644 GIT binary patch delta 579 zcmXZZJugFH7{>9tO`E7FM^Ud0QZME7G|Cqsl}N;3u#yOam`RAlNend*@se&55)*@n z4wfct29cET39uLq29y7lcKY4VInR0S>weCcSMqLVf_@=j_FQMyY-UUKW-;8rCfvhr zJVU*|#{|CNF#cc^6Afm4=vJM@4%X}F;vo)T348Ga`!Vd8Z=)2hQ)#q-YP^j)_!#4O zj%|2{?O4WE{6+-{Hdem#P>m)~4OXxd4{#8#FpIA^grS&U*^psuO*)NTxQd#17r7ie zMFqL6K7T-lw|C?$`$Pr%MKyGoLi^K5M$6$i&Y=b?U>YxciV=!3DtUme^O(Xg=22I+ zkGg?tjNl_q;tMKZyu~buNmP)js*705dJDBbj~RTz6lVV@G|-+v&NAb-eN;-R_*3!oMpLtQ_MWR(<7;tpzKw>X544g-@x5jA;)stY)S z)tEuOvOMYyyrK&~F^=D;0Vi5SLYP1evR-x%>zJRSuFqf$ziqyPW_ diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 7401cd5..278128d 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: alexandre delaunay , 2018\n" "Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n" @@ -23,136 +23,116 @@ msgstr "" "Language: fr_FR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Désinstaller" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Remplacement effectué avec succès" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Désinstallation effectuée avec succès" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Garder l'ancien lieu" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Vider le lieu" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Désinstaller" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Cycle de vie des matériels" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Raccourcis" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Préférences de lieux" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Remplacer la liste déroulante des statuts par les actions du plugin" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Désinstallation" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Remplacement" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "Archivage PDF" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "Archivage CSV" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Purge" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Suppression + Commentaires" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Ne pas supprimer + Commentaires" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Remplacement des données" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Type de modèle" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Modèle de transfert à utiliser" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Nouveau statut du matériel" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Action sur le groupe" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Nouveau groupe" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Ajouter un modèle" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Gestion des modèles" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Effacement de données" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Supprimer l'historique des logiciels (ordinateurs)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Effacement de tout l'historique" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Remplacement des données" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Informations générales" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Ecraser les informations (de l'ancien matériel vers le nouveau)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Méthode d'archivage de l'ancien matériel" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Le plugin PDF est installé et activé" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -160,45 +140,45 @@ msgstr "" "Le plugin PDF n'est pas installé, vous ne pouvez pas utiliser le format PDF " "pour l'archivage" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Connexion avec les autres matériels" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "connexions directes" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Lien OCSNG" msgstr[1] "Liens OCSNG" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "Ces options s'appliquent seulement aux ordinateurs provenant d'OCSNG" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Supprimer l'ordinateur dans OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Supprimer le lien avec la machine OCS" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Supprimer le lien avec FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Champs additionnels" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Supprimer les informations du plugin Fields" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Conserver la valeur actuelle" @@ -206,51 +186,13 @@ msgstr "Conserver la valeur actuelle" msgid "Item's location after uninstall" msgstr "Lieu du matériel après désinstallation" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Veuillez patienter, désinstallation en cours..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Matériel désinstallé" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Matériel désinstallé avec le modèle %s" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Matériel remplacé" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Matériel remplacé avec le modèle %s" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Matériel provenant d'un remplacement" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Supprimé d'OCSNG ID OCS" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Appliquer un modèle" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Lieu de l'élément après application du modèle" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Affecter à une nouvelle valeur" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Garder l'ancien lieu" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Cycle de vie" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Vider le lieu" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -304,6 +246,64 @@ msgstr "Nouveau matériel" msgid "Replace" msgstr "Remplacer" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Veuillez patienter, désinstallation en cours..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Matériel désinstallé" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Matériel désinstallé avec le modèle %s" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Matériel remplacé" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Matériel remplacé avec le modèle %s" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Matériel provenant d'un remplacement" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Supprimé d'OCSNG ID OCS" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Appliquer un modèle" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Lieu de l'élément après application du modèle" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Affecter à une nouvelle valeur" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Cycle de vie" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Raccourcis" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Préférences de lieux" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Remplacer la liste déroulante des statuts par les actions du plugin" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Cycle de vie des matériels (uninstall)" diff --git a/locales/hr_HR.po b/locales/hr_HR.po index cfb2ceb..8943596 100644 --- a/locales/hr_HR.po +++ b/locales/hr_HR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: milotype , 2020\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/teclib/teams/28042/hr_HR/)\n" @@ -21,182 +21,162 @@ 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:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Deinstaliraj" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Zamjena uspješna" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Deinstalacija uspješna" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Zadrži prethodnu lokaciju" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Prazna lokacija" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Deinstaliraj" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Životni vijek predmeta" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Prečaci" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Postavke lokacije" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Zamijeni padajući popis stanja s radnjama dodatka" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Deinstalacija" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Zamjena" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF arhiviranje" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV arhiviranje" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Izbriši" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Izbriši i komentiraj" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Zadrži i komentiraj" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Zamjenjivanje podataka" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Vrsta predloška" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Model prijenosa koji se koristiti" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Novo stanje računala" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Radnja na grupu" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Nova grupa" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Dodaj predložak" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Upravljaj predlošcima" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Izbriši podatke" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Izbriši povijest softvera (računala)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Izbriši cijelu povijest" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Zamjena informacija" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Opće informacije" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Prepiši informacije (od starog predmeta na novi)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Način arhiviranja starog materijala" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "PDF dodatak je instaliran i aktiviran" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "" "PDF dodatak još nije instaliran, arhiviranje u PDF formatu nije moguće" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Veze s ostalim materijalima" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Izravne veze" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG poveznica" msgstr[1] "OCSNG poveznice" msgstr[2] "OCSNG poveznice" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "Ove se opcije primjenjuju samo na računala koja dolaze iz OCSNG-a" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Izbriši računalo u OCSNG-u" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Izbriši poveznicu s računalom u OCSNG-u" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Izbriši računalo u FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Dodatna polja" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Izbriši informacije dodatka „Polja”" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Zadrži u trenutačnoj grupi" @@ -204,51 +184,13 @@ msgstr "Zadrži u trenutačnoj grupi" msgid "Item's location after uninstall" msgstr "Lokacija predmeta nakon deinstaliranja" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Pričekaj, deinstalacija je u tijeku …" - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Predmet je sada deinstaliran" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Predmet je sada deinstaliran s modelom %s" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Predmet je zamijenjen jednim novim" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Predmet je zamijenjen jednim novim s modelom %s" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Predmet zamijenjuje jedan stari" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Uklonjeno iz OCSNG-a s ID oznakom" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Primijeni model" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Lokacija predmeta nakon primjenjivanja modela" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Utjecaj na novu grupu" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Zadrži prethodnu lokaciju" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Životni vijek" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Prazna lokacija" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -302,6 +244,64 @@ msgstr "Novi predmet" msgid "Replace" msgstr "Zamijeni" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Pričekaj, deinstalacija je u tijeku …" + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Predmet je sada deinstaliran" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Predmet je sada deinstaliran s modelom %s" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Predmet je zamijenjen jednim novim" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Predmet je zamijenjen jednim novim s modelom %s" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Predmet zamijenjuje jedan stari" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Uklonjeno iz OCSNG-a s ID oznakom" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Primijeni model" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Lokacija predmeta nakon primjenjivanja modela" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Utjecaj na novu grupu" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Životni vijek" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Prečaci" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Postavke lokacije" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Zamijeni padajući popis stanja s radnjama dodatka" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Životni vijek predmeta (deinstaliraj)" diff --git a/locales/ko_KR.mo b/locales/ko_KR.mo index 383f4e00946ef5bbfa1710e1419bba79797af431..9a1ee7f729915e5dbd988836e008fd41be3e5961 100644 GIT binary patch delta 579 zcmXZYze|E)5Ww+EG)%HL%hbWj5;9+?lxm6o0YUI@2qc0U8l-4?si3W)DWah%f`$+r z1femSnp`6Yhkne_6xR284&?njcfR-B-P`j!ezO`14hKY@hDA~$QX3J8VRGI1-0%2^$Ycpk1DA#SC_{%;xcO84(bB?fgP^wg-6`rkI=YlTt~fd8}oQ<`5V;D z?=0@&5b-Cnw0xn~MVLwlnZyeExQY#&$MUTmx~K&|sGBAy+yJv?5w$_7br3#_wwB|i F=pR7>HkAMX delta 618 zcmXZYze_?<6u|LYRGMi1>eo5rxuwI6-6L9LpvA~N&&_1||vf(LC z;Em3|qfGv(V>ey*5(kmt)hJ5cG)g0Dn8Pic#X80?`JoqWl!D0tyW<6v$=9`;C, 2020\n" "Language-Team: Korean (Korea) (https://www.transifex.com/teclib/teams/28042/ko_KR/)\n" @@ -21,179 +21,159 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "제거" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "대체함" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "제거함" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "이전 위치 유지" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "빈 위치" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "제거" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "품목 주기" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "바로가기" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "위치 설정" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "플러그인 동작으로 상태 드롭다운 교체" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "제거" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "교체" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF 보관" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV 보관" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "제거" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "삭제 + 댓글" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "유지 + 댓글" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "데이터 교체" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "견본 유형" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "사용할 전송 모델" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "컴퓨터의 새 상태" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "그룹에서의 동작" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "새 그룹" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "견본 추가" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "견본 관리" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "데이터 소거" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "소프트웨어 이력 삭제 (컴퓨터)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "전체 이력 삭제" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "교체 정보" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "일반 정보" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "정보 덮어쓰기 (이전 품목에서 새 품목으로)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "이전 자료의 보관 방법" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "플러그인 PDF가 설치되어 활성화 되었습니다" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "플러그인 PDF가 설치되지 않았기에, 보관용 PDF 형식을 사용할 수 없습니다" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "다른 자료와 연결" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "직접 연결" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG 링크" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "이 옵션들은 OCSNG에서 가져온 컴퓨터들에만 적용됩니다" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "OCSNG에서 컴퓨터 삭제" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "OCSNG에서 컴퓨터와의 연결 삭제" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "FusionInventory에서 컴퓨터 삭제" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "추가 항목" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "항목 플러그인 정보 삭제" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "현재 그룹 유지" @@ -201,51 +181,13 @@ msgstr "현재 그룹 유지" msgid "Item's location after uninstall" msgstr "제거 후 품목 위치" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "기다리세요, 제거 중입니다..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "이제 품목이 제거 되었습니다" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "이제 모델 %s의 품목이 제거 되었습니다" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "품목이 새것으로 교체됨" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "품목이 모델 %s의 새것으로 교체됨" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "예전 것을 대체하는 품목" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "ID가 있는 OCSNG 에서 제거됨" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "모델 적용" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "모델 적용 후 품목 위치" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "새 그룹에 영향" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "이전 위치 유지" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "주기" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "빈 위치" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -299,6 +241,64 @@ msgstr "새 품목" msgid "Replace" msgstr "대체" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "기다리세요, 제거 중입니다..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "이제 품목이 제거 되었습니다" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "이제 모델 %s의 품목이 제거 되었습니다" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "품목이 새것으로 교체됨" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "품목이 모델 %s의 새것으로 교체됨" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "예전 것을 대체하는 품목" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "ID가 있는 OCSNG 에서 제거됨" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "모델 적용" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "모델 적용 후 품목 위치" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "새 그룹에 영향" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "주기" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "바로가기" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "위치 설정" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "플러그인 동작으로 상태 드롭다운 교체" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "품목 주기 (제거)" diff --git a/locales/pl_PL.mo b/locales/pl_PL.mo index 20d070aef352d23cf28a9292fd6a75ab5b0b06ea..b66ed171106ba66fcf2cf0be3828c613f3f9115f 100644 GIT binary patch delta 498 zcmXZZKTASU7{~EP4ZJ8_Ei286{#?3>EhR*Q1r08`7SW%@-a$iicj_ewHMD1wAdUsm z+8dA@YHJW0YG`Qa`@;i=^SS5Yoaa2}x$V*@?Eb}~V%+Q}WtKCu%%mB^0wy1~Q1N|S zz(XwK1!nOUSMdSY@D-=<%f(|PSz#UE9M)0$&ai@4zD1VjqeGyG&u-%ob-_1I<3wg$ zP#$Mlhd7VBxP(Wj!Y)z!@0?v+Wc`9F^c{6RPIBICg={oV91u_;Rn&$i?qCZ!V>ejE zdt}%flM;?FM4xAG;5HuMIeOSfz4!^$fe%dLuhUwTyG+2t87!k(y@yJ8f-2-1)v`y_ f#h<8-rT9O3$+~kB>Auxa7dLu?#Bs8Bnyz{O5Zf$Z delta 537 zcmXZZJ4?e*6u|N0i`I&@RqL~2>JYUdlBPpy2T|%66w$#4hy^QjP@#5}fVk-H;Na{g zLO+2H?&{RVQ9(ND=HUO(giC%mC--sAy)E-*_VKSHD0Pbb#6*Tfq|h%y6Q5TccTwY2 zoWygS!&^+?GiLA|XYd!3IL2g+XVE|(NAMVR+$Co5J}!Zb(s?5=f#2c4o`LoTX&fYO zBfn%BQ@D=fSiva_P!qdD9sd&A#5CV6)P#D;TIX9x&9agR+6(&xG?BesS7wQSb$S#7J(D?&8(*$xjj2oy&eT2H;1!^J> zs7LmRx^a?w(G$y~R508su2+hN>*N+~$FrS+ Qk;@ld*K&9o3w=w`e{N(pzW@LL diff --git a/locales/pl_PL.po b/locales/pl_PL.po index 9099bad..050cc91 100644 --- a/locales/pl_PL.po +++ b/locales/pl_PL.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: Jacek Maciol , 2017\n" "Language-Team: Polish (Poland) (https://www.transifex.com/teclib/teams/28042/pl_PL/)\n" @@ -21,136 +21,116 @@ 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:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Odinstaluj" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Wymiana zakończona powodzeniem" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Dezinstalacja zakończona sukcesem" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Zachowaj poprzednią lokalizację" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Opróżnij lokalizacje" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Odinstaluj" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Dezinstalacja" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Wymiana" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "Archiwizacja PDF" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "Archiwizacja CSV" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Oczyść" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Usuń + Komentarz" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Zostaw + Komentarz" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Zastępowanie danych" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Typ modelu" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Przenieś model do użycia" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Nowy status komputera" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Działanie w grupie" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Nowa grupa" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Dodaj szablon" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Zarządzaj szablonami" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Kasowanie danych" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Usuń historię oprogramowania (komputery)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Wymaż całą historię" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Wymiana danych" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Informacje ogólne" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Zastąp informacje (ze starego przedmiotu na nowy)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Metoda archiwizacji dla starego sprzętu" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Wtyczka PDF jest zainstalowana i aktywowana" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -158,15 +138,15 @@ msgstr "" "Wtyczka PDF nie jest zainstalowana, nie można używać formatu PDF do " "archiwizacji" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Połączenia z innymi materiałami" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Połączenia bezpośrednie" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Łącze OCSNG" @@ -174,31 +154,31 @@ msgstr[1] "Łącze OCSNG" msgstr[2] "Łącza OCSNG" msgstr[3] "Łącza OCSNG" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "Te opcje dotyczą tylko komputerów z OCSNG" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Usuń komputer w OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Usuń łącze z komputerem w OCSNG" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Usuń komputer w FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Pola dodatkowe" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Usuń informacje z wtyczki Fields" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Zachowaj aktualną wartość" @@ -206,51 +186,13 @@ msgstr "Zachowaj aktualną wartość" msgid "Item's location after uninstall" msgstr "Lokalizacja przedmiotu po odinstalowaniu" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Proszę czekać, trwa dezinstalacja..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Odinstalowany sprzęt" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Element zastąpiony nowym" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Przedmiot zastępujący stary" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Usunięto z OCSNG z ID" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Dotyczy nowej grupy" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Zachowaj poprzednią lokalizację" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Opróżnij lokalizacje" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -304,6 +246,64 @@ msgstr "Nowy przedmiot" msgid "Replace" msgstr "Zastąp" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Proszę czekać, trwa dezinstalacja..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Odinstalowany sprzęt" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Element zastąpiony nowym" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Przedmiot zastępujący stary" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Usunięto z OCSNG z ID" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Dotyczy nowej grupy" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "" diff --git a/locales/pt_BR.mo b/locales/pt_BR.mo index d06f1b7777ce4b139e0009ccffc052c29f28749d..d5eb357ce58b69dd4f80766aa83ddee0155e505f 100644 GIT binary patch delta 498 zcmXZYJxD@P6u|NG2<+pPPc6)^QpmKjAZlxIZ4ep@2@--Jnj9SEIf+wCORFgKhK4{0 z3YTbbkOs%VXi^BL!lh{Ff70o9@8O=W+exWrz%CL@W`h%#OT94|fL_@d2aQ z!43RGH%8_}Vwl2Z%%B%9a2<=diZ>X>7hJ;++(e&S?EeO7s%hdO`tcljBPCqGOVj~s z7{q7Pf^QhZZ`{HVTWJ11YP}QG{5&pUc^t1JJIlRgi%fHPA`rqhYJ)!NM*0mVL~##O zNH00V9W3B3IvB?;X3?O#3y)Fbrx?HrYU3*Eg15QxgGclcc*h8SVHz!h+jxLUETInO f;0m@-2O6Lb`h(0auKCf|`x~zlN0W`LX-@qCNKP{u delta 537 zcmXZYzb`{k6u|M*h$^L}8b4Y;UX(}6)w9QwU_4+)2X|Fta diff --git a/locales/pt_BR.po b/locales/pt_BR.po index 1242727..85469cb 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: Eduardo Spinola , 2017\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n" @@ -22,136 +22,116 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Desinstalar" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Substituição executada com sucesso" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Desinstalação executada com sucesso" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Manter localização anterior" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Esvaziar localização" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Desinstalar" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Desinstalação" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Recolocação" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "Arquivando PDF" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "Arquivando CSV" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Limpar" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Apagar + Comentar" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Manter + Comentar" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Substituindo dados" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Tipo de modelo" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Modelo de transferência a utilizar" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Novo status do computador" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Ação no grupo" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Novo grupo" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Adicionar model" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Gerenciar modelos" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Excluir dados" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Excluir hisórico de software (computadores)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Excluir todo histórico" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Substituição de informações" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Informações gerais" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Sobrescrever informações (da mais antiga a mais recente)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Método de arquivamento do material antigo" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Plugin PDF está instalado e ativado" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -159,45 +139,45 @@ msgstr "" "Plugin PDF não está instalado, você não poderá utilizar o arquivamento no " "formato PDF" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Conexões com outros materiais" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Conexões diretas" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Conexão OCSNG" msgstr[1] "Conexões OCSNG" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "Estas opções apenas se aplicam a computadores vindos do OCSNG" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Excluir computador no OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Excluir conexão com computador no OCSNG" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Excluir computador no Fusioninventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Campos adicional" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Excluir campos de informações do plugin" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Manter no grupo atua" @@ -205,51 +185,13 @@ msgstr "Manter no grupo atua" msgid "Item's location after uninstall" msgstr "Localização do item após a desinstalação" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Por favor aguarde, desinstalação em execução..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "O item está desinstalado" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Item substituído por outro" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Item substituindo um mais antigo" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Removido do OCSNG com ID" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Impacto a um novo grupo" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Manter localização anterior" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Esvaziar localização" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -303,6 +245,64 @@ msgstr "Novo item" msgid "Replace" msgstr "Substituir" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Por favor aguarde, desinstalação em execução..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "O item está desinstalado" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Item substituído por outro" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Item substituindo um mais antigo" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Removido do OCSNG com ID" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Impacto a um novo grupo" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "" diff --git a/locales/pt_PT.mo b/locales/pt_PT.mo index f37011c6810884962521416d5c906654f0ad5036..f344b527aa1f16cf103bf3f78b161ef7bc58c1d7 100644 GIT binary patch delta 579 zcmXZaKP&@b7{~DkMT@FBRMCcLin_#~Moc84gTX3|0Z9jm&4!R%NK6t*V%EgYv*$Lmn3=7%n|0zA#_<4q z@Dw}n3j6R5bNGU-_=717lSF1wc?vj&MI6CH?8j@&;A6}@b6I?_k-!91RCod%TtIrW z73{(iD!~q_&>4>6Z4kfVIPo_QV}@kixP*$=aT1SE4f%2J|AbXGczr=wl-~99yGG zq8gh=rfo%3!p$JQKuzWb)%X(*;5#jf90n znp7eYGchn2B&3N!tOldW_r=}vdGB)fe($|sA^H|AOqW~NWlBBOD&1@z%6 z(wo}BM$DrWI6*n^4*T)l&MWviLLS6!oWUmCwDWz`$uChFDtWE{2_3Y{JLSh#)KD6l zL^m#C7p~cP9$n, 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/teclib/teams/28042/pt_PT/)\n" @@ -21,136 +21,116 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Desinstalar" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Substituição bem sucedida" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Desinstalação bem sucedida" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Manter o local anterior" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Localização vazia" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Desinstalar" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Ciclo de vida do item" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Atalhos" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Preferências de localização" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Substituir o dropdown de estado pelas ações do plugin" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Desinstalação" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Substituição" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "Arquivo PDF" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "Arquivo CSV" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Purge" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Deletar + Comentar" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Manter + Comentar" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Substituição de dados" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Tipo de Template" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Modelo de transferência está a utilizar" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Novo estado do computador" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Ação em grupo" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Novo grupo" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Adicionar template" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Gerir modelos" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Apagar Dados" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Apagar histórico de software (computadores)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Apagar toda a história" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Informações substituídas" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Informações gerais" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Sobrescrever informações (do item antigo para o novo)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Método de arquivamento do material antigo" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "Plugin PDF é instalado e ativado" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -158,45 +138,45 @@ msgstr "" "Plugin PDF não está instalado, você não será capaz de usar o formato PDF " "para arquivamento" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Conexões com outros materias" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Conexões diretas" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "Ligação OCSNG" msgstr[1] "Ligações OCSNG" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "Estas opções se aplicam somente computadores vindo de OCSNG" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "Excluir computador em OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "Excluir link com computador em OCSNG" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "Excluir o computador em FusionInventory" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Campos adicionais" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Excluir informações do plugin de campos" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Manter-se no grupo atual" @@ -204,51 +184,13 @@ msgstr "Manter-se no grupo atual" msgid "Item's location after uninstall" msgstr "Localização do item após desinstalar" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Por favor aguarde, desinstalação em execução…" - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Item está agora desinstalado" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Item é desinstalado agora com modelo %s" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Item substituído por um novo" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Item substituído por um novo com modelo %s" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Item de substituição de um antigo" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "Removido do OCSNG com ID" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Aplicar o modelo" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Localização do item depois de aplicar o modelo" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Afetar a um novo grupo" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Manter o local anterior" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Ciclo de vida" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Localização vazia" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -302,6 +244,64 @@ msgstr "Novo item" msgid "Replace" msgstr "Substituição" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Por favor aguarde, desinstalação em execução…" + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Item está agora desinstalado" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Item é desinstalado agora com modelo %s" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Item substituído por um novo" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Item substituído por um novo com modelo %s" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Item de substituição de um antigo" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "Removido do OCSNG com ID" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Aplicar o modelo" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Localização do item depois de aplicar o modelo" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Afetar a um novo grupo" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Ciclo de vida" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Atalhos" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Preferências de localização" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Substituir o dropdown de estado pelas ações do plugin" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Ciclo de vida do item (desinstalar)" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index 42cdff8f9d48287a59b1a7b3a2aee65374434139..348d3d7375102b103f0854ca7642836ff0e0e5d5 100644 GIT binary patch delta 239 zcmWm8uL{Co7=`iUzikc~6PaRgLlMSsHy{WW!D1GZmths7&7{d{5Zj_)vl*-ggVo>_ z2>N{Kcfxsj&#wLnHs56}FCB|gN7BWTTKK{Ue;8wAOMM(;7gw0z0h@S7(|=ks2W86f}w delta 278 zcmWm8u}cDR7{>8OJ=ur)ps3Hw() zieKpB51P9Tnj(Lz--27Z82fjx>2&_|JoA(3JdK-S(ChobwIAFxdr=&Q-GEtbEXUph DGX5l5 diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 179fcc7..f66e5e6 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: Nikolai Petrov , 2018\n" "Language-Team: Russian (Russia) (https://www.transifex.com/teclib/teams/28042/ru_RU/)\n" @@ -21,136 +21,116 @@ 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:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Удалить" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Успешная замена" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Успешное удаление" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Сохранить предыдущее местоположение" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Пустое местоположение" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Удалить" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Удаление" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Замена" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF Архивирование" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr " CSV Архивирование" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Очистить" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Удалить + Комментарий" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Сохранить + Комментарий" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Замена данных" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Тип шаблона" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Модель переноса для использования" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Новый статус компьютера" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Действие по группе" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Новая группа" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Добавить шаблон" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Управление шаблонами" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Сбросить даты" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Удалить историю ПО (компьютеры)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Удалить всю историю" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Замена информации" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Общая информация" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" @@ -158,15 +138,15 @@ msgstr "" "Плагин PDF не установлен, вы не сможете использовать формат PDF для " "архивации" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "" @@ -174,31 +154,31 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "" @@ -206,51 +186,13 @@ msgstr "" msgid "Item's location after uninstall" msgstr "" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Пожалуйста, ожидайте, удаление запущено..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Сохранить предыдущее местоположение" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Пустое местоположение" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -304,6 +246,64 @@ msgstr "" msgid "Replace" msgstr "" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Пожалуйста, ожидайте, удаление запущено..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index 229f07c5340fea603d859e47f8cc854fab2122cd..5138e8a5f81870217e0930c22ba26572d29e5528 100644 GIT binary patch delta 579 zcmXZZ%_~Gv7{~F)M86LukJUNqt#jGDf$O2u{WIn delta 618 zcmXZZIY?tbkce#8iB#hO zR^c%=;yKph4Yptrd+-x^#pf3pz!3If0_!p3_H#H${|Gzr0WJLSi}U{@$mj+F3Dg7& zs0FMdwMh;&(GE7@KI-^W)CI3Gj3qSi7u&EuAkvCc*o(`kg*d3=&jOA}kj5hcUU}uC zJN`nAd&r{kcBE(-M%I=|^kLF<33Xl?HQ^@eiR9h?S7_6}L*2*^n&@$uH9{kXLzu=n z+(R#xup8enf)#9EPsYGm97R2$ZPbN#u^A7MDRO~&rMH;GB3c+`ke);|NkbEFVF#X| z-t|3d0WYXKExGac!d6ATGO}n+Z)8&0mGw1qCY8;^yKE~uVOnFRHQp7C#ckWLcnaRy G+sZ%3zeAP) diff --git a/locales/tr_TR.po b/locales/tr_TR.po index f35cb8e..16a9172 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: 2017-01-03 22:10+0000\n" "Last-Translator: Kaya Zeren , 2018\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/teclib/teams/28042/tr_TR/)\n" @@ -21,181 +21,161 @@ msgstr "" "Language: tr_TR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "Kaldır" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "Değiştirildi" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "Kaldırıldı" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "Önceki konum korunsun" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "Boş konum" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "Kaldır" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "Ögenin Yaşam Döngüsü" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "Kısayollar" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "Konum ayarları" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "Durum açılan kutusu uygulama eki işlemlerine göre değiştirilsin" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "Kaldırma" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Değişiklik" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF Arşivleme" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV Arşivleme" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "Boşalt" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "Sil ve Yorum Yaz" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "Koru ve Yorum Yaz" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "Veri değiştiriliyor" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "Kalıp türü" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "Kullanılacak aktarım modeli" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "Bilgisayarın yeni durumu" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "Gruba uygulanacak işlem" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "Yeni grup" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "Kalıp ekle" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "Kalıp yönetimi" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "Verileri sil" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "Yazılım geçmişini sil (bilgisayarlar)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "Tüm geçmişi sil" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "Bilgi değişikliği" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "Genel bilgiler" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "Üzerine yazılacak bilgiler (eski ögeden yeniye)" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Eski materyali arşivleme yöntemi" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "PDF uygulama eki kuruldu ve etkinleştirildi" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "PDF uygulama eki kurulmamış, arşivleme için PDF biçimi kullanılamaz" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "Diğer materyaller ile bağlantılar" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "Doğrudan bağlantılar" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG bağlantısı" msgstr[1] "OCSNG bağlantısı" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "" "Bu ayarlar yalnız bilgileri OCSNG üzerinden alınan bilgisayarlara uygulanır" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "OCSNG üzerinden bilgisayar sil" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "OCSNG üzerinden bilgisayar bağlantısını sil" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "FusionInventory üzerinden bilgisayar sil" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "Ek alanlar" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "Alanlar uygulama eki bilgilerini sil" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "Geçerli grupta tut" @@ -203,51 +183,13 @@ msgstr "Geçerli grupta tut" msgid "Item's location after uninstall" msgstr "Kaldırma sonrası öge konumu" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "Lütfen bekleyin kaldırma işlemi sürüyor..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "Öge kaldırıldı" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "Öge %s modeliyle kaldırıldı" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "Yenisi ile değiştirilen öge" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "Öge %s modeliyle yenisi ile değiştirildi" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "Eskinin yerine konulan öge" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "OCSNG üzerinden kod ile kaldırıldı" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "Modeli uygula" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "Model uygulandıktan sonra ögenin konumu" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "Yeni bir gruba etki" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "Önceki konum korunsun" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "Yaşam Döngüsü" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "Boş konum" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -301,6 +243,64 @@ msgstr "Yeni öge" msgid "Replace" msgstr "Değiştir" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "Lütfen bekleyin kaldırma işlemi sürüyor..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "Öge kaldırıldı" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "Öge %s modeliyle kaldırıldı" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "Yenisi ile değiştirilen öge" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "Öge %s modeliyle yenisi ile değiştirildi" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "Eskinin yerine konulan öge" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "OCSNG üzerinden kod ile kaldırıldı" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "Modeli uygula" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "Model uygulandıktan sonra ögenin konumu" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "Yeni bir gruba etki" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "Yaşam Döngüsü" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "Kısayollar" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "Konum ayarları" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "Durum açılan kutusu uygulama eki işlemlerine göre değiştirilsin" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "Ögenin Yaşam Döngüsü (kaldır)" diff --git a/locales/uninstall.pot b/locales/uninstall.pot index d359cf4..767d673 100644 --- a/locales/uninstall.pot +++ b/locales/uninstall.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-07 10:16+0000\n" +"POT-Creation-Date: 2020-07-05 11:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,180 +18,160 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: front/action.php:55 inc/replace.class.php:476 -msgid "Replacement successful" -msgstr "" - -#: front/action.php:96 inc/uninstall.class.php:324 -msgid "Uninstallation successful" -msgstr "" - -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "" - #: hook.php:42 inc/uninstall.class.php:110 msgid "Uninstall" msgstr "" -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 -msgid "Item's Lifecycle" -msgstr "" - -#: inc/config.class.php:81 -msgid "Shortcuts" +#: front/action.php:55 inc/replace.class.php:476 +msgid "Replacement successful" msgstr "" -#: inc/config.class.php:87 -msgid "Location preferences" +#: front/action.php:96 inc/uninstall.class.php:325 +msgid "Uninstallation successful" msgstr "" -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 +msgid "Item's Lifecycle" msgstr "" -#: inc/model.class.php:106 inc/model.class.php:987 inc/model.class.php:1029 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "" -#: inc/model.class.php:108 inc/model.class.php:989 inc/model.class.php:1031 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "" -#: inc/model.class.php:210 inc/model.class.php:830 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "" -#: inc/model.class.php:219 inc/model.class.php:794 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "" -#: inc/model.class.php:251 inc/model.class.php:840 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "" -#: inc/model.class.php:301 inc/model.class.php:702 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "" -#: inc/model.class.php:306 inc/model.class.php:860 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "" -#: inc/model.class.php:418 inc/model.class.php:850 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "" msgstr[1] "" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "" -#: inc/model.class.php:592 inc/model.class.php:813 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "" -#: inc/model.class.php:598 inc/model.class.php:821 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "" -#: inc/model.class.php:994 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "" @@ -199,50 +179,12 @@ msgstr "" msgid "Item's location after uninstall" msgstr "" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "" - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" msgstr "" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" msgstr "" #: inc/replace.class.php:40 @@ -297,6 +239,64 @@ msgstr "" msgid "Replace" msgstr "" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "" + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr "" diff --git a/locales/zh_CN.mo b/locales/zh_CN.mo index b3bc09703a3e9f3b560e88ef26b0865ae38998d4..de46bc5ce802843857559de1d6640707c5834ae3 100644 GIT binary patch delta 498 zcmXZYIYy+=xtwAC@O_=qwW(6}l8ZqOsbN33zh;KY@ z;xzFCX7B|ku!|*(FoyvzEf`bBvVOnSZ}@>;C;7HNaCoj2F)&H0hgf>|sFs>l?FN&kFH4s&ErE!M1yd zx|wUNU=uaS7wX&}oJA|f`8jv_fQ9~e)!jff*upiep|0=(XRv{qyo0*(4^(}GYM302 S&7ktd_Iqk?xV;~I5B&jUkS}Wh delta 537 zcmXZYy-Px26vy!+VK17QK@kOJ5=P0b>orKFmTGBu7&np#}kdZF*>9=Z6rzjL2^o_n72jVNPfo-{K9?=Mnrlsj$AUupVsGa1lMr@k1&O2IE;@Gss1ngpg=GA!Bz})`8j6B z%{1ypIn)i7EN@vpMD25mw317EerrD4^EcE1KD(;^O_PF7`fCeg97mWuin=h1<2Y-1 z8+C%Rd5n58_c()f)Ip-%e&0SEB9Ecg7tQ4jZuE;+%}vw|_i+*rP>=8$, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/teclib/teams/28042/zh_CN/)\n" @@ -22,179 +22,159 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: hook.php:42 inc/uninstall.class.php:110 +msgid "Uninstall" +msgstr "卸载" + #: front/action.php:55 inc/replace.class.php:476 msgid "Replacement successful" msgstr "置换成功" -#: front/action.php:96 inc/uninstall.class.php:324 +#: front/action.php:96 inc/uninstall.class.php:325 msgid "Uninstallation successful" msgstr "卸载成功" -#: ajax/locations.php:43 inc/preference.class.php:74 inc/replace.class.php:589 -msgid "Keep previous location" -msgstr "保留以前的位置" - -#: ajax/locations.php:44 inc/preference.class.php:75 inc/replace.class.php:593 -msgid "Empty location" -msgstr "空位" - -#: hook.php:42 inc/uninstall.class.php:110 -msgid "Uninstall" -msgstr "卸载" - -#: inc/config.class.php:39 inc/model.class.php:66 inc/uninstall.class.php:38 +#: inc/model.class.php:66 inc/uninstall.class.php:38 inc/config.class.php:39 msgid "Item's Lifecycle" msgstr "" -#: inc/config.class.php:81 -msgid "Shortcuts" -msgstr "" - -#: inc/config.class.php:87 -msgid "Location preferences" -msgstr "" - -#: inc/config.class.php:95 -msgid "Replace status dropdown by plugin actions" -msgstr "" - -#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028 +#: inc/model.class.php:107 inc/model.class.php:988 inc/model.class.php:1030 msgid "Uninstallation" msgstr "卸载" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:109 inc/model.class.php:990 inc/model.class.php:1032 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "替代" -#: inc/model.class.php:118 +#: inc/model.class.php:119 msgid "PDF Archiving" msgstr "PDF存档" -#: inc/model.class.php:120 +#: inc/model.class.php:121 msgid "CSV Archiving" msgstr "CSV存档" -#: inc/model.class.php:123 +#: inc/model.class.php:124 msgid "Purge" msgstr "清除" -#: inc/model.class.php:124 +#: inc/model.class.php:125 msgid "Delete + Comment" msgstr "删除+评论" -#: inc/model.class.php:125 +#: inc/model.class.php:126 msgid "Keep + Comment" msgstr "保留+评论" -#: inc/model.class.php:166 +#: inc/model.class.php:167 msgid "Replacing data" msgstr "替换数据" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:211 inc/model.class.php:831 msgid "Type of template" msgstr "模板类型" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:220 inc/model.class.php:795 msgid "Transfer's model to use" msgstr "使用转移的模型" -#: inc/model.class.php:239 inc/replace.class.php:603 +#: inc/model.class.php:240 inc/replace.class.php:603 msgid "New status of the computer" msgstr "计算机的新状态" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:252 inc/model.class.php:841 msgid "Action on group" msgstr "作用于群组" -#: inc/model.class.php:263 +#: inc/model.class.php:264 msgid "New group" msgstr "新群组" -#: inc/model.class.php:284 +#: inc/model.class.php:285 msgid "Add template" msgstr "添加模板" -#: inc/model.class.php:287 +#: inc/model.class.php:288 msgid "Manage templates" msgstr "管理模板" -#: inc/model.class.php:298 +#: inc/model.class.php:299 msgid "Erase datas" msgstr "擦除数据" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:302 inc/model.class.php:703 msgid "Delete software history (computers)" msgstr "删除软件历史（计算机）" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:307 inc/model.class.php:861 msgid "Delete the whole history" msgstr "删除所有历史记录" -#: inc/model.class.php:388 inc/model.class.php:438 +#: inc/model.class.php:389 inc/model.class.php:439 msgid "Informations replacement" msgstr "信息替换" -#: inc/model.class.php:389 inc/replace.class.php:549 +#: inc/model.class.php:390 inc/replace.class.php:549 msgid "General informations" msgstr "一般信息" -#: inc/model.class.php:411 inc/replace.class.php:564 +#: inc/model.class.php:412 inc/replace.class.php:564 msgid "Overwrite informations (from old item to the new)" msgstr "覆盖信息（从旧项目到新项目）" -#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567 +#: inc/model.class.php:419 inc/model.class.php:851 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "历史档案的存档方法" -#: inc/model.class.php:428 +#: inc/model.class.php:429 msgid "Plugin PDF is installed and activated" msgstr "插件PDF已安装并激活" -#: inc/model.class.php:431 +#: inc/model.class.php:432 msgid "" "Plugin PDF is not installed, you won't be able to use PDF format for " "archiving" msgstr "未安装插件PDF，您将无法使用PDF格式进行存档" -#: inc/model.class.php:439 inc/replace.class.php:625 +#: inc/model.class.php:440 inc/replace.class.php:625 msgid "Connections with other materials" msgstr "用其他材料连接" -#: inc/model.class.php:513 inc/replace.class.php:660 +#: inc/model.class.php:514 inc/replace.class.php:660 msgid "Direct connections" msgstr "直接连接" -#: inc/model.class.php:586 +#: inc/model.class.php:587 msgid "OCSNG link" msgid_plural "OCSNG links" msgstr[0] "OCSNG链接" -#: inc/model.class.php:588 +#: inc/model.class.php:589 msgid "These options only apply to computers coming from OCSNG" msgstr "这些选项仅适用于来自OCSNG的计算机" -#: inc/model.class.php:592 inc/model.class.php:812 +#: inc/model.class.php:593 inc/model.class.php:814 msgid "Delete computer in OCSNG" msgstr "在OCSNG中删除计算机" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:599 inc/model.class.php:822 msgid "Delete link with computer in OCSNG" msgstr "在OCSNG中删除与计算机的链接" -#: inc/model.class.php:612 +#: inc/model.class.php:613 msgid "Delete computer in FusionInventory" msgstr "在FusionInventory中删除计算机" -#: inc/model.class.php:624 +#: inc/model.class.php:625 msgid "Additionnal fields" msgstr "附加字段" -#: inc/model.class.php:628 +#: inc/model.class.php:629 msgid "Delete Fields plugin informations" msgstr "删除字段插件信息" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:995 inc/uninstall.class.php:763 msgid "Keep in the current group" msgstr "保持在当前组中" @@ -202,51 +182,13 @@ msgstr "保持在当前组中" msgid "Item's location after uninstall" msgstr "卸载后项目的位置" -#: inc/uninstall.class.php:114 -msgid "Please wait, uninstallation is running..." -msgstr "请稍等，卸载正在运行..." - -#: inc/uninstall.class.php:545 -msgid "Item is now uninstalled" -msgstr "现在已卸载项目" - -#: inc/uninstall.class.php:547 -#, php-format -msgid "Item is now uninstalled with model %s" -msgstr "" - -#: inc/uninstall.class.php:553 -msgid "Item replaced by a new one" -msgstr "项目由新项目替换" - -#: inc/uninstall.class.php:555 -#, php-format -msgid "Item replaced by a new one with model %s" -msgstr "" - -#: inc/uninstall.class.php:561 -msgid "Item replacing an old one" -msgstr "项目替换旧项目" - -#: inc/uninstall.class.php:566 -msgid "Removed from OCSNG with ID" -msgstr "已从带有ID的OCSNG中删除" - -#: inc/uninstall.class.php:663 -msgid "Apply model" -msgstr "" - -#: inc/uninstall.class.php:680 -msgid "Item's location after applying model" -msgstr "" - -#: inc/uninstall.class.php:763 -msgid "Affect to a new group" -msgstr "对新组的影响" +#: inc/preference.class.php:74 inc/replace.class.php:589 ajax/locations.php:43 +msgid "Keep previous location" +msgstr "保留以前的位置" -#: inc/uninstall.class.php:815 -msgid "Lifecycle" -msgstr "" +#: inc/preference.class.php:75 inc/replace.class.php:593 ajax/locations.php:44 +msgid "Empty location" +msgstr "空位" #: inc/replace.class.php:40 msgid "Item's replacement" @@ -300,6 +242,64 @@ msgstr "新项目" msgid "Replace" msgstr "替代" +#: inc/uninstall.class.php:114 +msgid "Please wait, uninstallation is running..." +msgstr "请稍等，卸载正在运行..." + +#: inc/uninstall.class.php:546 +msgid "Item is now uninstalled" +msgstr "现在已卸载项目" + +#: inc/uninstall.class.php:548 +#, php-format +msgid "Item is now uninstalled with model %s" +msgstr "" + +#: inc/uninstall.class.php:554 +msgid "Item replaced by a new one" +msgstr "项目由新项目替换" + +#: inc/uninstall.class.php:556 +#, php-format +msgid "Item replaced by a new one with model %s" +msgstr "" + +#: inc/uninstall.class.php:562 +msgid "Item replacing an old one" +msgstr "项目替换旧项目" + +#: inc/uninstall.class.php:567 +msgid "Removed from OCSNG with ID" +msgstr "已从带有ID的OCSNG中删除" + +#: inc/uninstall.class.php:664 +msgid "Apply model" +msgstr "" + +#: inc/uninstall.class.php:681 +msgid "Item's location after applying model" +msgstr "" + +#: inc/uninstall.class.php:764 +msgid "Affect to a new group" +msgstr "对新组的影响" + +#: inc/uninstall.class.php:816 +msgid "Lifecycle" +msgstr "" + +#: inc/config.class.php:81 +msgid "Shortcuts" +msgstr "" + +#: inc/config.class.php:87 +msgid "Location preferences" +msgstr "" + +#: inc/config.class.php:95 +msgid "Replace status dropdown by plugin actions" +msgstr "" + #: setup.php:111 msgid "Item's Lifecycle (uninstall)" msgstr ""
" . __("Apply model", 'uninstall') . "
" . __("Item's location after applying model", "uninstall") ."