diff --git a/composer.lock b/composer.lock index 4f4f4810..a111dd2f 100644 --- a/composer.lock +++ b/composer.lock @@ -9,16 +9,16 @@ "packages-dev": [ { "name": "consolidation/annotated-command", - "version": "4.1.1", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da" + "reference": "4b596872f24c39d9c04d7b3adb6bc51baa1f2fd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/efc58dc0f34a45539787c5190b41b5d2a50a08da", - "reference": "efc58dc0f34a45539787c5190b41b5d2a50a08da", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/4b596872f24c39d9c04d7b3adb6bc51baa1f2fd5", + "reference": "4b596872f24c39d9c04d7b3adb6bc51baa1f2fd5", "shasum": "" }, "require": { @@ -50,7 +50,7 @@ } }, "branch-alias": { - "dev-master": "4.x-dev" + "dev-main": "4.x-dev" } }, "autoload": { @@ -69,34 +69,35 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2020-05-27T21:11:36+00:00" + "time": "2020-10-03T14:28:42+00:00" }, { "name": "consolidation/config", - "version": "1.2.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/consolidation/config.git", - "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1" + "reference": "9842670aad3406dbc8df3069fd680a9f8cd6edd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", - "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1", + "url": "https://api.github.com/repos/consolidation/config/zipball/9842670aad3406dbc8df3069fd680a9f8cd6edd7", + "reference": "9842670aad3406dbc8df3069fd680a9f8cd6edd7", "shasum": "" }, "require": { "dflydev/dot-access-data": "^1.1.0", "grasmash/expander": "^1", - "php": ">=5.4.0" + "php": ">=7.1.3" }, "require-dev": { "g1a/composer-test-scenarios": "^3", - "php-coveralls/php-coveralls": "^1", - "phpunit/phpunit": "^5", - "squizlabs/php_codesniffer": "2.*", - "symfony/console": "^2.5|^3|^4", - "symfony/yaml": "^2.8.11|^3|^4" + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^6", + "squizlabs/php_codesniffer": "^3", + "symfony/console": "^4|^5", + "symfony/event-dispatcher": "^4|^5", + "symfony/yaml": "^4|^5" }, "suggest": { "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader" @@ -106,32 +107,17 @@ "scenarios": { "symfony4": { "require-dev": { - "symfony/console": "^4.0" + "symfony/console": "^4" }, "config": { "platform": { "php": "7.1.3" } } - }, - "symfony2": { - "require-dev": { - "symfony/console": "^2.8", - "symfony/event-dispatcher": "^2.8", - "phpunit/phpunit": "^4.8.36" - }, - "remove": [ - "php-coveralls/php-coveralls" - ], - "config": { - "platform": { - "php": "5.4.8" - } - } } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -150,7 +136,7 @@ } ], "description": "Provide configuration services for a commandline tool.", - "time": "2019-03-03T19:37:04+00:00" + "time": "2020-05-27T17:11:23+00:00" }, { "name": "consolidation/log", @@ -282,48 +268,48 @@ }, { "name": "consolidation/robo", - "version": "1.4.12", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "eb45606f498b3426b9a98b7c85e300666a968e51" + "reference": "1a7c652371615fd72ff05380ffe6ce263eb31eb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/eb45606f498b3426b9a98b7c85e300666a968e51", - "reference": "eb45606f498b3426b9a98b7c85e300666a968e51", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/1a7c652371615fd72ff05380ffe6ce263eb31eb3", + "reference": "1a7c652371615fd72ff05380ffe6ce263eb31eb3", "shasum": "" }, "require": { - "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", + "consolidation/annotated-command": "^4.2.1", + "consolidation/config": "^1.2.1|^2", + "consolidation/log": "^1.1.1|^2.0.1", + "consolidation/output-formatters": "^4.1.1", + "consolidation/self-update": "^1.2", "league/container": "^2.4.1", - "php": ">=5.5.0", - "symfony/console": "^2.8|^3|^4", - "symfony/event-dispatcher": "^2.5|^3|^4", - "symfony/filesystem": "^2.5|^3|^4", - "symfony/finder": "^2.5|^3|^4", - "symfony/process": "^2.5|^3|^4" + "php": ">=7.1.3", + "symfony/console": "^4.4.11|^5", + "symfony/event-dispatcher": "^4.4.11|^5", + "symfony/filesystem": "^4.4.11|^5", + "symfony/finder": "^4.4.11|^5", + "symfony/process": "^4.4.11|^5" }, - "replace": { - "codegyre/robo": "< 1.0" + "conflict": { + "codegyre/robo": "*" }, "require-dev": { "g1a/composer-test-scenarios": "^3", "natxet/cssmin": "3.0.4", "patchwork/jsqueeze": "^2", "pear/archive_tar": "^1.4.4", - "php-coveralls/php-coveralls": "^1", - "phpunit/phpunit": "^5.7.27", + "php-coveralls/php-coveralls": "^2.2", + "phpdocumentor/reflection-docblock": "^4.3.2", + "phpunit/phpunit": "^6.5.14", "squizlabs/php_codesniffer": "^3" }, "suggest": { "henrikbjorn/lurker": "For monitoring filesystem changes in taskWatch", - "natxet/CssMin": "For minifying CSS files in taskMinify", + "natxet/cssmin": "For minifying CSS files in taskMinify", "patchwork/jsqueeze": "For minifying JS files in taskMinify", "pear/archive_tar": "Allows tar archives to be created and extracted in taskPack and taskExtract, respectively." }, @@ -335,36 +321,27 @@ "scenarios": { "symfony4": { "require": { - "symfony/console": "^4" - }, - "config": { - "platform": { - "php": "7.1.3" - } - } - }, - "symfony2": { - "require": { - "symfony/console": "^2.8" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.36" + "symfony/console": "^4.4.11", + "symfony/event-dispatcher": "^4.4.11", + "symfony/filesystem": "^4.4.11", + "symfony/finder": "^4.4.11", + "symfony/process": "^4.4.11", + "phpunit/phpunit": "^6", + "nikic/php-parser": "^2" }, "remove": [ - "php-coveralls/php-coveralls" + "codeception/phpunit-wrapper" ], "config": { "platform": { - "php": "5.5.9" + "php": "7.1.3" } - }, - "scenario-options": { - "create-lockfile": "false" } } }, "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev", + "dev-main": "2.x-dev" } }, "autoload": { @@ -383,7 +360,7 @@ } ], "description": "Modern task runner", - "time": "2020-02-18T17:31:26+00:00" + "time": "2020-09-08T16:23:18+00:00" }, { "name": "consolidation/self-update", @@ -464,6 +441,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" }, { @@ -564,20 +542,20 @@ }, { "name": "glpi-project/tools", - "version": "0.1.13", + "version": "0.1.14", "source": { "type": "git", "url": "https://github.com/glpi-project/tools.git", - "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41" + "reference": "fd2d9d5a8a465640efe8f20334a6ee302cafe05e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/tools/zipball/2028ecf9acd8b838cff37771dcab77ced9391f41", - "reference": "2028ecf9acd8b838cff37771dcab77ced9391f41", + "url": "https://api.github.com/repos/glpi-project/tools/zipball/fd2d9d5a8a465640efe8f20334a6ee302cafe05e", + "reference": "fd2d9d5a8a465640efe8f20334a6ee302cafe05e", "shasum": "" }, "require": { - "consolidation/robo": "^1.3", + "consolidation/robo": "^1.3 || ^2.0", "glpi-project/coding-standard": "^0.7", "natxet/cssmin": "^3.0", "patchwork/jsqueeze": "^1.0" @@ -610,7 +588,7 @@ "plugins", "tools" ], - "time": "2020-06-19T10:29:26+00:00" + "time": "2020-10-26T07:33:44+00:00" }, { "name": "grasmash/expander", @@ -659,54 +637,6 @@ "description": "Expands internal property references in PHP arrays file.", "time": "2017-12-21T22:14:55+00:00" }, - { - "name": "grasmash/yaml-expander", - "version": "1.4.0", - "source": { - "type": "git", - "url": "https://github.com/grasmash/yaml-expander.git", - "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1", - "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1", - "shasum": "" - }, - "require": { - "dflydev/dot-access-data": "^1.1.0", - "php": ">=5.4", - "symfony/yaml": "^2.8.11|^3|^4" - }, - "require-dev": { - "greg-1-anderson/composer-test-scenarios": "^1", - "phpunit/phpunit": "^4.8|^5.5.4", - "satooshi/php-coveralls": "^1.0.2|dev-master", - "squizlabs/php_codesniffer": "^2.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Grasmash\\YamlExpander\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Matthew Grasmick" - } - ], - "description": "Expands internal property references in a yaml file.", - "time": "2017-12-16T16:06:03+00:00" - }, { "name": "league/container", "version": "2.4.1", @@ -859,6 +789,7 @@ "javascript", "minification" ], + "abandoned": true, "time": "2015-03-25T10:11:08+00:00" }, { @@ -959,16 +890,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.5", + "version": "3.5.8", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4", + "reference": "9d583721a7157ee997f235f327de038e7ea6dac4", "shasum": "" }, "require": { @@ -1006,20 +937,20 @@ "phpcs", "standards" ], - "time": "2020-04-17T01:09:41+00:00" + "time": "2020-10-23T02:01:07+00:00" }, { "name": "symfony/console", - "version": "v4.4.10", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "326b064d804043005526f5a0494cfb49edb59bb0" + "reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/326b064d804043005526f5a0494cfb49edb59bb0", - "reference": "326b064d804043005526f5a0494cfb49edb59bb0", + "url": "https://api.github.com/repos/symfony/console/zipball/90933b39c7b312fc3ceaa1ddeac7eb48cb953124", + "reference": "90933b39c7b312fc3ceaa1ddeac7eb48cb953124", "shasum": "" }, "require": { @@ -1097,20 +1028,20 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:06:45+00:00" + "time": "2020-09-15T07:58:55+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.10", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866" + "reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5370aaa7807c7a439b21386661ffccf3dff2866", - "reference": "a5370aaa7807c7a439b21386661ffccf3dff2866", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/e17bb5e0663dc725f7cdcafc932132735b4725cd", + "reference": "e17bb5e0663dc725f7cdcafc932132735b4725cd", "shasum": "" }, "require": { @@ -1128,6 +1059,7 @@ "psr/log": "~1.0", "symfony/config": "^3.4|^4.0|^5.0", "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/error-handler": "~3.4|~4.4", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/http-foundation": "^3.4|^4.0|^5.0", "symfony/service-contracts": "^1.1|^2", @@ -1181,7 +1113,7 @@ "type": "tidelift" } ], - "time": "2020-05-20T08:37:50+00:00" + "time": "2020-09-18T14:07:46+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -1261,16 +1193,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.10", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b27f491309db5757816db672b256ea2e03677d30" + "reference": "ebc51494739d3b081ea543ed7c462fa73a4f74db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b27f491309db5757816db672b256ea2e03677d30", - "reference": "b27f491309db5757816db672b256ea2e03677d30", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/ebc51494739d3b081ea543ed7c462fa73a4f74db", + "reference": "ebc51494739d3b081ea543ed7c462fa73a4f74db", "shasum": "" }, "require": { @@ -1321,24 +1253,24 @@ "type": "tidelift" } ], - "time": "2020-05-30T18:50:54+00:00" + "time": "2020-09-27T13:54:16+00:00" }, { "name": "symfony/finder", - "version": "v4.4.10", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "5729f943f9854c5781984ed4907bbb817735776b" + "reference": "60d08560f9aa72997c44077c40d47aa28a963230" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b", - "reference": "5729f943f9854c5781984ed4907bbb817735776b", + "url": "https://api.github.com/repos/symfony/finder/zipball/60d08560f9aa72997c44077c40d47aa28a963230", + "reference": "60d08560f9aa72997c44077c40d47aa28a963230", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=7.1.3" }, "type": "library", "extra": { @@ -1384,24 +1316,24 @@ "type": "tidelift" } ], - "time": "2020-03-27T16:54:36+00:00" + "time": "2020-10-02T07:34:48+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-ctype": "For best performance" @@ -1409,7 +1341,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1460,24 +1392,24 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.17.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7110338d81ce1cbc3e273136e4574663627037a7" + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", - "reference": "7110338d81ce1cbc3e273136e4574663627037a7", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531", + "reference": "39d483bdf39be819deabf04ec872eb0b2410b531", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "suggest": { "ext-mbstring": "For best performance" @@ -1485,7 +1417,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1537,29 +1469,29 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.17.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" + "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", - "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/8ff431c517be11c78c48a39a66d37431e26a6bed", + "reference": "8ff431c517be11c78c48a39a66d37431e26a6bed", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1613,29 +1545,29 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.17.1", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" + "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", - "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de", + "reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de", "shasum": "" }, "require": { - "php": ">=7.0.8" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-main": "1.20-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1693,24 +1625,24 @@ "type": "tidelift" } ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-10-23T14:02:19+00:00" }, { "name": "symfony/process", - "version": "v4.4.10", + "version": "v4.4.15", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5" + "reference": "9b887acc522935f77555ae8813495958c7771ba7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c714958428a85c86ab97e3a0c96db4c4f381b7f5", - "reference": "c714958428a85c86ab97e3a0c96db4c4f381b7f5", + "url": "https://api.github.com/repos/symfony/process/zipball/9b887acc522935f77555ae8813495958c7771ba7", + "reference": "9b887acc522935f77555ae8813495958c7771ba7", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=7.1.3" }, "type": "library", "extra": { @@ -1756,7 +1688,7 @@ "type": "tidelift" } ], - "time": "2020-05-30T20:06:45+00:00" + "time": "2020-09-02T16:08:58+00:00" }, { "name": "symfony/service-contracts", @@ -1833,79 +1765,6 @@ } ], "time": "2020-07-06T13:19:58+00:00" - }, - { - "name": "symfony/yaml", - "version": "v4.4.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", - "reference": "c2d2cc66e892322cfcc03f8f12f8340dbd7a3f8a", - "shasum": "" - }, - "require": { - "php": ">=7.1.3", - "symfony/polyfill-ctype": "~1.8" - }, - "conflict": { - "symfony/console": "<3.4" - }, - "require-dev": { - "symfony/console": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.4-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "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": [], diff --git a/datainjection.xml b/datainjection.xml index c1d19ec1..4d48211c 100644 --- a/datainjection.xml +++ b/datainjection.xml @@ -28,6 +28,11 @@ Xavier Caillaud + + 2.8.1 + ~9.5.0 + https://github.com/pluginsGLPI/datainjection/releases/download/2.8.1/glpi-datainjection-2.8.1.tar.bz2 + 2.8.0 ~9.5.0 diff --git a/inc/commoninjectionlib.class.php b/inc/commoninjectionlib.class.php index 5725edc2..a2131d69 100644 --- a/inc/commoninjectionlib.class.php +++ b/inc/commoninjectionlib.class.php @@ -502,7 +502,12 @@ private function manageFieldValues() { foreach ($data as $field => $value) { if (!in_array($field, $blacklisted_fields)) { $searchOption = self::findSearchOption($searchOptions, $field); - $this->getFieldValue($injectionClass, $itemtype, $searchOption, $field, $value); + //searchoption relation type is already manage by manageRelations() + //skip it + if ((isset($searchOption['displaytype']) && $searchOption['displaytype'] != 'relation') + || !isset($searchOption['displaytype'])) { + $this->getFieldValue($injectionClass, $itemtype, $searchOption, $field, $value); + } } } @@ -1627,9 +1632,6 @@ private function manageRelations() { null, $option['relationclass'], $option, $option['linkfield'], $value, true ); - - //Remove the old option - $this->unsetValue($itemtype, $option['linkfield']); } } } diff --git a/inc/entityinjection.class.php b/inc/entityinjection.class.php index 55599685..200c8eb4 100644 --- a/inc/entityinjection.class.php +++ b/inc/entityinjection.class.php @@ -87,27 +87,62 @@ function addOrUpdateObject($values = [], $options = []) { } + public static function getRootEntityName() { + $root = new Entity(); + $root->getFromDb(0); + + return $root->fields['name']; + } + + /** * @param $input array * @param $add (true by default) * @param $rights array **/ function customimport($input = [], $add = true, $rights = []) { - if (!isset($input['completename']) || empty($input['completename'])) { return -1; } + $em = new Entity(); + + // Search for exisiting entity + $search = $input['completename']; + + // Check if search start by root entity + $root = self::getRootEntityName(); + if (strpos($search, $root) !== 0) { + $search = "$root > $search"; + } + + $results = $em->find(['completename' => $search]); + + if (count($results)) { + $ent = array_pop($results); + return $this->updateExistingEntity($ent['id'], $input); + } else { + return $this->importEntity($input); + } + } + + public function importEntity($input) { + $em = new Entity(); + // Import a full tree from completename $names = explode('>', $input['completename']); - $fk = $this->getForeignKeyField(); $i = count($names); $parent = 0; - $entity = new Entity(); $level = 0; + // Remove root entity if specified + if (strcmp(trim($names[0]), trim(self::getRootEntityName())) === 0) { + unset($names[0]); + } + foreach ($names as $name) { $name = trim($name); + $i--; $level++; if (empty($name)) { @@ -127,23 +162,37 @@ function customimport($input = [], $add = true, $rights = []) { $tmp['level'] = $level; $tmp['entities_id'] = $parent; - //Does the entity alread exists ? + // Does the entity alread exists ? $results = getAllDataFromTable( - 'glpi_entities', - ['name' => $name, 'entities_id' => $parent] + 'glpi_entities', + ['name' => $name, 'entities_id' => $parent] ); - //Entity doesn't exists => create it + + // Entity doesn't exists => create it if (empty($results)) { - $parent = CommonDropdown::import($tmp); + $parent = $em->import($tmp); } else { - //Entity already exists, use the ID as parent - $ent = array_pop($results); - $parent = $ent['id']; + // Entity already exists, use the ID as parent + $ent = array_pop($results); + $parent = $ent['id']; } } + return $parent; } + public function updateExistingEntity($id, $input) { + $em = new Entity(); + + // Update entity + $input['id'] = $id; + unset($input['completename']); + unset($input['entities_id']); + $em->update($input); + + return $id; + } + /** * @param $injectionClass @@ -156,16 +205,16 @@ function customDataAlreadyInDB($injectionClass, $values, $options) { return false; } $results = getAllDataFromTable( - 'glpi_entities', - ['completename' => $values['completename']] + 'glpi_entities', + ['completename' => $values['completename']] ); if (empty($results)) { - return false; + return false; } - $ent = array_pop($results); - return $ent['id']; + $ent = array_pop($results); + return $ent['id']; } } diff --git a/locales/cs_CZ.mo b/locales/cs_CZ.mo index 77b72faa..d78e9bec 100644 Binary files a/locales/cs_CZ.mo and b/locales/cs_CZ.mo differ diff --git a/locales/cs_CZ.po b/locales/cs_CZ.po index 13542802..42b7bab3 100644 --- a/locales/cs_CZ.po +++ b/locales/cs_CZ.po @@ -5,17 +5,17 @@ # # Translators: # Cédric Anne, 2018 -# David Stepan , 2018 # Pavel Borecki , 2019 +# David Stepan , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" -"Last-Translator: Pavel Borecki , 2019\n" +"Last-Translator: David Stepan , 2020\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/teclib/teams/28042/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -242,7 +242,7 @@ msgstr "Do souboru" msgid "From the model" msgstr "Ze šablony" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Nespecifikováno" @@ -391,7 +391,7 @@ msgstr "Tato entita vám není přístupná" #: inc/computerinjection.class.php:72 msgid "Antivirus name" -msgstr "" +msgstr "Název antiviru" #: inc/modelcsv.class.php:160 msgid "Specific file format options" @@ -429,50 +429,50 @@ msgstr "-------Zvolte tabulku-------" msgid "-------Choose a field-------" msgstr "-------Zvolte kolonku-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Přidat z CSV souboru" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Aktualizovat z CSV souboru" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Nemáte oprávnění importovat data" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Nemáte oprávnění aktualizovat data" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Velikost vkládané hodnoty je příliš obsáhlá" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Import není dovolen" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Import se nezdařil" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "Přinejmenším jedna povinná kolonka není vyplněná" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Data pro vložení jsou v pořádku" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Jedna data nejsou správného typu" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Varování" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Data nebyla nalezena" diff --git a/locales/datainjection.pot b/locales/datainjection.pot index 827d0db6..5acf5b7f 100644 --- a/locales/datainjection.pot +++ b/locales/datainjection.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -229,7 +229,7 @@ msgstr "" msgid "From the model" msgstr "" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "" @@ -416,50 +416,50 @@ msgstr "" msgid "-------Choose a field-------" msgstr "" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "" diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 439ea13a..99065f91 100644 Binary files a/locales/en_GB.mo and b/locales/en_GB.mo differ diff --git a/locales/en_GB.po b/locales/en_GB.po index 8e2f49b0..6f157242 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-07-10 10:45+0000\n" -"PO-Revision-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" +"PO-Revision-Date: 2020-10-27 14:24+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -232,7 +232,7 @@ msgstr "Into the file" msgid "From the model" msgstr "From the model" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Undetermined" @@ -421,50 +421,50 @@ msgstr "-------Choose a table-------" msgid "-------Choose a field-------" msgstr "-------Choose a field-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Add from CSV file" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Update from CSV file" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "No right to import data" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "No right to update data" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Size of the inserted value is to expansive" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Import not allowed" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Import failed" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "At least one mandatory field is not present" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Data to insert are correct" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "One data is not the good type" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Warning" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Data not found" diff --git a/locales/fi_FI.po b/locales/fi_FI.po index de87acd2..bace679b 100644 --- a/locales/fi_FI.po +++ b/locales/fi_FI.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: Cédric Anne, 2018\n" "Language-Team: Finnish (Finland) (https://www.transifex.com/teclib/teams/28042/fi_FI/)\n" @@ -236,7 +236,7 @@ msgstr "Tiedostoon" msgid "From the model" msgstr "Mallista" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Määrittelemätön" @@ -423,50 +423,50 @@ msgstr "-------Valitse taulukko-------" msgid "-------Choose a field-------" msgstr "-------Valitse kenttä-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Lisää CSV-tiedostosta" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Päivitä CSV-tiedostosta" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Ei oikeutta tuoda tietoja" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Ei oikeutta päivittää tietoja" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Syötetyn arvo koko laajeneva" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Tuonti ei sallittu" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Tuonti epäonnistui" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "Ainakin yksi pakollinen kenttä puuttuu" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Syötetyt tiedot ovat oikeita" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Yksi tieto ei ole oikeaa tyyppiä" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Varoitus" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Tietoja ei löytynyt" diff --git a/locales/fr_FR.po b/locales/fr_FR.po index 47253dac..20dd3314 100644 --- a/locales/fr_FR.po +++ b/locales/fr_FR.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: mab18, 2020\n" "Language-Team: French (France) (https://www.transifex.com/teclib/teams/28042/fr_FR/)\n" @@ -237,7 +237,7 @@ msgstr "Dans le fichier" msgid "From the model" msgstr "Depuis le modèle" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Indéterminé" @@ -426,50 +426,50 @@ msgstr "-------Choisir une table-------" msgid "-------Choose a field-------" msgstr "-------Choisir un champ-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Ajout depuis le fichier CSV" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Mis à jour depuis le fichier CSV" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Vous n'avez pas les droits nécessaires pour importer des données" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Vous n'avez pas les droits nécessaires pour mettre à jour des données" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Le nombre de valeurs à insérer est trop important" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Import interdit" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Import impossible" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "Au moins un champ obligatoire n'est pas rempli" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Les données à importer sont valides" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Au moins une donnée n'a pas le bon format / type" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Attention" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Donnée introuvable" diff --git a/locales/hr_HR.mo b/locales/hr_HR.mo index 88ae5d8f..0cb1ea0f 100644 Binary files a/locales/hr_HR.mo and b/locales/hr_HR.mo differ diff --git a/locales/hr_HR.po b/locales/hr_HR.po index 6e012e62..e8b9e531 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: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: milotype , 2020\n" "Language-Team: Croatian (Croatia) (https://www.transifex.com/teclib/teams/28042/hr_HR/)\n" @@ -238,7 +238,7 @@ msgstr "U datoteku" msgid "From the model" msgstr "Od modela" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Neodređeno" @@ -387,7 +387,7 @@ msgstr "Ne možeš pristupiti ovom entitetu" #: inc/computerinjection.class.php:72 msgid "Antivirus name" -msgstr "" +msgstr "Ime antivirusa" #: inc/modelcsv.class.php:160 msgid "Specific file format options" @@ -425,50 +425,50 @@ msgstr "------ Odaberi tablicu ------" msgid "-------Choose a field-------" msgstr "------ Odaberi polje ------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Dodaj iz CDV datoteke" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Aktualiziraj iz CDV datoteke" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Nedostaje pravo za uvoz podataka" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Nedostaje pravo za aktualiziranje podataka" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Umetnute vrijednosti su predugačke" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Uvoz nije dozvoljen" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Uvoz neuspio" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "Barem jedno obavezno polje nedostaje" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Podaci za umetanje su ispravni" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Jedan podatak nije dobre vrste" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Upozorenje" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Podaci nisu pronađeni" diff --git a/locales/ja_JP.mo b/locales/ja_JP.mo new file mode 100644 index 00000000..e94ef20b Binary files /dev/null and b/locales/ja_JP.mo differ diff --git a/locales/ja_JP.po b/locales/ja_JP.po new file mode 100644 index 00000000..3ef9a0cb --- /dev/null +++ b/locales/ja_JP.po @@ -0,0 +1,466 @@ +# 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: +# AOZO, 2020 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" +"PO-Revision-Date: 2018-06-21 12:57+0000\n" +"Last-Translator: AOZO, 2020\n" +"Language-Team: Japanese (Japan) (https://www.transifex.com/teclib/teams/28042/ja_JP/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja_JP\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: hook.php:124 hook.php:141 setup.php:63 +msgid "Can't create folder" +msgstr "フォルダを作成できません" + +#: front/mapping.form.php:60 +msgid "" +"One link field must be selected: it will be used to check if data already " +"exists" +msgstr "１つ以上のリンクフィールドを選択してください：同じデータか確認するために使用します" + +#: front/mapping.form.php:76 +msgid "" +"This step allows you to add informations not present in the file. You'll be " +"asked for theses informations while using the model." +msgstr "このタブでは、ファイルに存在しない追加情報を定義できます。追加情報はインジェクションの途中で入力が求められます。" + +#: front/clientinjection.form.php:34 inc/profile.class.php:67 +#: inc/menu.class.php:38 setup.php:94 +msgid "Data injection" +msgstr "インジェクション" + +#: front/clientinjection.form.php:50 +msgid "One mandatory field is not filled" +msgstr "1つの必須フィールドが入力されていません" + +#: front/clientinjection.form.php:83 front/model.form.php:88 +msgid "The file could not be found" +msgstr "ファイルが見つかりませんでした" + +#: front/popup.php:37 inc/mapping.class.php:117 +msgid "See the file" +msgstr "ファイルを見る" + +#: front/popup.php:43 inc/model.class.php:1518 +msgid "Data injection report" +msgstr "インジェクション レポート" + +#: inc/dropdown.class.php:37 +msgid "dd-mm-yyyy" +msgstr "dd-mm-yyyy" + +#: inc/dropdown.class.php:39 +msgid "mm-dd-yyyy" +msgstr "mm-dd-yyyy" + +#: inc/dropdown.class.php:41 +msgid "yyyy-mm-dd" +msgstr "yyyy-mm-dd" + +#: inc/dropdown.class.php:60 +msgid "1 234.56" +msgstr "1 234.56" + +#: inc/dropdown.class.php:62 +msgid "1 234,56" +msgstr "1 234.56" + +#: inc/dropdown.class.php:64 +msgid "1,234.56" +msgstr "1,234.56" + +#: inc/dropdown.class.php:87 inc/model.class.php:770 +#: inc/clientinjection.class.php:153 +msgid "File to inject" +msgstr "インジェクションするファイル" + +#: inc/dropdown.class.php:88 inc/model.class.php:772 +msgid "Mappings" +msgstr "マッピング" + +#: inc/dropdown.class.php:90 inc/model.class.php:775 +msgid "Additional Information" +msgstr "追加情報" + +#: inc/dropdown.class.php:94 +msgid "Model available for use" +msgstr "モデルは使用可能です" + +#: inc/dropdown.class.php:119 +msgid "Automatic detection" +msgstr "自動検出" + +#: inc/dropdown.class.php:122 +msgid "UTF-8" +msgstr "UTF-8" + +#: inc/dropdown.class.php:123 +msgid "ISO8859-1" +msgstr "ISO8859-1" + +#: inc/profile.class.php:40 +msgid "Model management" +msgstr "モデル管理" + +#: inc/profile.class.php:43 inc/clientinjection.class.php:214 +#: inc/menu.class.php:56 inc/menu.class.php:57 inc/menu.class.php:61 +msgid "Injection of the file" +msgstr "ファイルをインジェクション" + +#: inc/model.class.php:384 inc/model.class.php:670 +msgid "Allow lines creation" +msgstr "行を追加する" + +#: inc/model.class.php:393 inc/model.class.php:673 +msgid "Allow lines update" +msgstr "行を更新する" + +#: inc/model.class.php:402 inc/model.class.php:658 +msgid "Type of data to import" +msgstr "インポートタイプ" + +#: inc/model.class.php:412 inc/model.class.php:682 +msgid "Allow creation of dropdowns" +msgstr "ドロップダウンを作成する" + +#: inc/model.class.php:420 inc/model.class.php:686 +msgid "Dates format" +msgstr "日付形式" + +#: inc/model.class.php:429 inc/model.class.php:699 +msgid "Float format" +msgstr "小数点形式" + +#: inc/model.class.php:439 inc/model.class.php:708 +msgid "Try to establish network connection is possible" +msgstr "ネットワーク接続の登録を試みる" + +#: inc/model.class.php:449 inc/model.class.php:712 +msgid "Port unicity criteria" +msgstr "ポートユニティ基準" + +#: inc/model.class.php:678 +msgid "Advanced options" +msgstr "高度なオプション" + +#: inc/model.class.php:695 +msgid "Allow update of existing fields" +msgstr "フィールドの値を更新する" + +#: inc/model.class.php:738 +msgctxt "button" +msgid "Validate the model" +msgstr "モデルを検証する" + +#: inc/model.class.php:803 +msgid "Load this file" +msgstr "このファイルをロード" + +#: inc/model.class.php:882 +msgid "Please enter a name for the model" +msgstr "モデルの名前を入力してください" + +#: inc/model.class.php:891 +msgid "Your model should allow import and/or update of data" +msgstr "モデルはデータの追加/更新を許可する必要があります" + +#: inc/model.class.php:910 +msgid "You are not the initial creator of this model" +msgstr "あなたはこのモデルの作成者ではありません" + +#: inc/model.class.php:973 +#, php-format +msgid "Impossible to copy the file in %s" +msgstr "%s でファイルをコピーできない" + +#: inc/model.class.php:981 +msgid "File format is wrong" +msgstr "ファイル形式が間違っています" + +#: inc/model.class.php:982 +msgid "Extension csv required" +msgstr "拡張csvが必要" + +#: inc/model.class.php:1059 +msgid "Not data to import" +msgstr "データがありません" + +#: inc/model.class.php:1119 +msgid "The file is ok." +msgstr "ファイルに問題ありません。" + +#: inc/model.class.php:1144 +msgid "The number of columns of the file is incorrect." +msgstr "ファイルの列数が間違っています。" + +#: inc/model.class.php:1146 +#, php-format +msgid "%d awaited column" +msgid_plural "%d awaited columns" +msgstr[0] "%d 列必要です　" + +#: inc/model.class.php:1151 +#, php-format +msgid "%d found column" +msgid_plural "%d found columns" +msgstr[0] "%d 列あります" + +#: inc/model.class.php:1191 +msgid "At least one column is incorrect" +msgstr "少なくとも1つの列が正しくありません" + +#: inc/model.class.php:1199 +msgid "Into the file" +msgstr "ファイルへ " + +#: inc/model.class.php:1204 +msgid "From the model" +msgstr "モデルから" + +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 +msgid "Undetermined" +msgstr "未定" + +#: inc/model.class.php:1444 inc/model.class.php:1527 +msgid "Array of successful injections" +msgstr "一連のインジェクションが成功" + +#: inc/model.class.php:1451 inc/model.class.php:1481 inc/model.class.php:1530 +#: inc/model.class.php:1550 +msgid "Line" +msgstr "行" + +#: inc/model.class.php:1452 inc/model.class.php:1483 inc/model.class.php:1531 +#: inc/model.class.php:1552 +msgid "Data Import" +msgstr "データのインポート" + +#: inc/model.class.php:1453 inc/model.class.php:1484 inc/model.class.php:1532 +#: inc/model.class.php:1553 +msgid "Injection type" +msgstr "インジェクション タイプ" + +#: inc/model.class.php:1454 inc/model.class.php:1485 inc/model.class.php:1533 +#: inc/model.class.php:1554 +msgid "Object Identifier" +msgstr "オブジェクト識別子" + +#: inc/model.class.php:1474 inc/model.class.php:1547 +msgid "Array of unsuccessful injections" +msgstr "一連のインジェクションが失敗" + +#: inc/model.class.php:1482 inc/model.class.php:1551 inc/model.class.php:1568 +msgid "Data check" +msgstr "データチェック" + +#: inc/clientinjection.class.php:88 +msgid "Use an existing model" +msgstr "モデルの選択" + +#: inc/clientinjection.class.php:96 +msgid "No model currently available" +msgstr "利用可能なモデルはありません" + +#: inc/clientinjection.class.php:105 +msgid "You can start the model creation by hitting the button" +msgstr "ボタンを押すとモデルの作成を開始できます" + +#: inc/clientinjection.class.php:156 inc/info.class.php:247 +msgid "Choose a file" +msgstr "ファイルを選択" + +#: inc/clientinjection.class.php:162 +msgid "File encoding" +msgstr "文字コード" + +#: inc/clientinjection.class.php:170 +msgid "Warning : existing mapped column will be overridden" +msgstr "警告：既存のマップされた列は上書きされます" + +#: inc/clientinjection.class.php:173 +msgid "" +"Watch out, you're about to inject data into GLPI. Are you sure you want to " +"do it ?" +msgstr "GLPIにデータをインジェクションします。 実行してもよろしいですか？" + +#: inc/clientinjection.class.php:180 +msgid "Launch the import" +msgstr "インジェクション開始" + +#: inc/clientinjection.class.php:210 +msgid "Import progress" +msgstr "インジェクション状況" + +#: inc/clientinjection.class.php:280 +#, php-format +msgid "Injection of the file... %d%%" +msgstr "ファイルのインジェクション... %d%%" + +#: inc/clientinjection.class.php:297 +msgid "Injection finished" +msgstr "インジェクション完了" + +#: inc/clientinjection.class.php:370 +msgid "Injection's results" +msgstr "インジェクションの結果" + +#: inc/clientinjection.class.php:375 +msgid "Injection successful" +msgstr "インジェクション成功" + +#: inc/clientinjection.class.php:378 +msgid "Injection encounters errors" +msgstr "インジェクションでエラーが発生しました" + +#: inc/clientinjection.class.php:387 +msgid "See the log" +msgstr "ログを見る" + +#: inc/clientinjection.class.php:393 +msgid "Export rapport in PDF" +msgstr "PDFでレポートを表示" + +#: inc/clientinjection.class.php:399 +msgid "Export the log" +msgstr "ログを表示" + +#: inc/clientinjection.class.php:407 +msgid "Finish" +msgstr "完了" + +#: inc/info.class.php:84 inc/info.class.php:141 inc/mapping.class.php:124 +msgid "Tables" +msgstr "テーブル" + +#: inc/info.class.php:86 inc/info.class.php:143 +msgid "Mandatory information" +msgstr "必須情報" + +#: inc/info.class.php:142 +msgid "Fields" +msgstr "フィールド" + +#: inc/info.class.php:246 +msgid "Complementary information" +msgstr "補足情報" + +#: inc/info.class.php:256 +msgid "Download file sample" +msgstr "サンプルファイルをダウンロード" + +#: inc/webservice.class.php:78 +msgid "Model unknown" +msgstr "不明なモデル" + +#: inc/webservice.class.php:86 inc/webservice.class.php:95 +msgid "You cannot access this model" +msgstr "このモデルにアクセスできません" + +#: inc/webservice.class.php:115 +msgid "Entity unknown" +msgstr "不明なエンティティ" + +#: inc/webservice.class.php:123 +msgid "You cannot access this entity" +msgstr "このエンティティにアクセスできません" + +#: inc/computerinjection.class.php:72 +msgid "Antivirus name" +msgstr "ウイルス対策ソフト" + +#: inc/modelcsv.class.php:160 +msgid "Specific file format options" +msgstr "ファイル形式のオプション" + +#: inc/modelcsv.class.php:163 +msgid "Header's presence" +msgstr "ヘッダー有り" + +#: inc/modelcsv.class.php:167 +msgid "File delimitor" +msgstr "列の区切り文字" + +#: inc/networkequipmentinjection.class.php:72 +msgid "Number of ports" +msgstr "ポート数" + +#: inc/mapping.class.php:123 +msgid "Header of the file" +msgstr "ファイルのヘッダー" + +#: inc/mapping.class.php:126 +msgid "Link field" +msgstr "リンクフィールド" + +#: inc/networkportinjection.class.php:89 +msgid "Port MAC address" +msgstr "ポートMACアドレス" + +#: inc/injectiontype.class.php:131 +msgid "-------Choose a table-------" +msgstr "------- テーブルを選択 ---------" + +#: inc/injectiontype.class.php:193 +msgid "-------Choose a field-------" +msgstr "------- フィールドを選択 ---------" + +#: inc/commoninjectionlib.class.php:1876 +msgid "Add from CSV file" +msgstr "CSVファイルから追加" + +#: inc/commoninjectionlib.class.php:1878 +msgid "Update from CSV file" +msgstr "CSVファイルから更新" + +#: inc/commoninjectionlib.class.php:1919 +msgid "No right to import data" +msgstr "インジェクションする権限がありません" + +#: inc/commoninjectionlib.class.php:1923 +msgid "No right to update data" +msgstr "データを更新する権利がありません" + +#: inc/commoninjectionlib.class.php:1927 +msgid "Size of the inserted value is to expansive" +msgstr "挿入された値のサイズを拡張する " + +#: inc/commoninjectionlib.class.php:1931 +msgid "Import not allowed" +msgstr "データの追加は許可されていません" + +#: inc/commoninjectionlib.class.php:1935 +msgid "Import failed" +msgstr "インポートに失敗しました" + +#: inc/commoninjectionlib.class.php:1939 +msgid "At least one mandatory field is not present" +msgstr "少なくとも1つの必須フィールドが存在しません" + +#: inc/commoninjectionlib.class.php:1943 +msgid "Data to insert are correct" +msgstr "挿入するデータは正しい" + +#: inc/commoninjectionlib.class.php:1947 +msgid "One data is not the good type" +msgstr "1つのデータは適切なタイプではありません" + +#: inc/commoninjectionlib.class.php:1951 +msgid "Warning" +msgstr "警告" + +#: inc/commoninjectionlib.class.php:1955 +msgid "Data not found" +msgstr "データが見つかりません" diff --git a/locales/ko_KR.po b/locales/ko_KR.po index cfd1ca36..795f5b68 100644 --- a/locales/ko_KR.po +++ b/locales/ko_KR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: SeongHyeon Cho , 2020\n" "Language-Team: Korean (Korea) (https://www.transifex.com/teclib/teams/28042/ko_KR/)\n" @@ -230,7 +230,7 @@ msgstr "파일 내" msgid "From the model" msgstr "모델에서" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "미결됨" @@ -417,50 +417,50 @@ msgstr "-------테이블 선택-------" msgid "-------Choose a field-------" msgstr "-------항목 선택-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "CSV 파일에서 추가" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "CSV 파일에서 갱신" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "데이터 불러오기 권한 없음" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "데이터 갱신 권한 없음" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "삽입된 값의 크기가 너무 큽니다" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "불러오기 허용안됨" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "불러오기 실패함" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "하나 이상의 필수 항목이 없습니다" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "삽입할 데이터가 정확합니다" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "하나의 데이터가 바른 유형이 아닙니다" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "경고" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "데이터 없음" diff --git a/locales/pt_BR.po b/locales/pt_BR.po index 1bd8aaa8..f8b5cc51 100644 --- a/locales/pt_BR.po +++ b/locales/pt_BR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: Cédric Anne, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/teclib/teams/28042/pt_BR/)\n" @@ -237,7 +237,7 @@ msgstr "Inserindo o arquivo" msgid "From the model" msgstr "Do modelo" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Impossível determinar" @@ -426,50 +426,50 @@ msgstr "-------Escolha uma tabela-------" msgid "-------Choose a field-------" msgstr "-------Escolha um campo-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Adicionar de arquivo CSV" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Atualizar com arquivo CSV" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Sem direitos para importação dos dados" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Sem direitos para atualização dos dados" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "O tamanho do valor inserido é expansivo" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Importação não permitida" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Falha na importação" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "Pelo menos um dos campos obrigatórios não está presente, verifique" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Dados para importação estão corretos" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Um dado não está de acordo" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Aviso" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Dados não encontrados" diff --git a/locales/pt_PT.po b/locales/pt_PT.po index 28d32c6a..5f44cc41 100644 --- a/locales/pt_PT.po +++ b/locales/pt_PT.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: Rui Melo , 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/teclib/teams/28042/pt_PT/)\n" @@ -237,7 +237,7 @@ msgstr "Para o arquivo" msgid "From the model" msgstr "Partir do modelo" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Indeterminado" @@ -426,50 +426,50 @@ msgstr "———Escolha uma mesa———" msgid "-------Choose a field-------" msgstr "———Escolha um campo———" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Adicionar a partir do ficheiro CSV" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Atualizara partir do ficheiro CSV" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Não há direito de importar dados" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Não há direito de atualizar dados" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Tamanho do valor inserido é a expansivo" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Importação não permitida" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Importação falhada" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "Pelo menos um campo obrigatório não está presente" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Dados para inserir estão corretos" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Dados não são do tipo bom" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Aviso" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Dados não encontrados" diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 4a5b4993..9dd76066 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: Pavlo Lacenko , 2018\n" "Language-Team: Russian (Russia) (https://www.transifex.com/teclib/teams/28042/ru_RU/)\n" @@ -237,7 +237,7 @@ msgstr "" msgid "From the model" msgstr "" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "" @@ -424,50 +424,50 @@ msgstr "-------Выберите таблицу-------" msgid "-------Choose a field-------" msgstr "-------Выберите поле-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "Добавить из CSV файла" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "Обновить из CSV файла" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Нет прав для импорта" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Нет прав для обновления" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Импорт не разрешен" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Предупреждение" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Данные не найдены" diff --git a/locales/tr_TR.mo b/locales/tr_TR.mo index ef8c3a5f..151ebf53 100644 Binary files a/locales/tr_TR.mo and b/locales/tr_TR.mo differ diff --git a/locales/tr_TR.po b/locales/tr_TR.po index fc6e0869..a11ca88d 100644 --- a/locales/tr_TR.po +++ b/locales/tr_TR.po @@ -5,16 +5,16 @@ # # Translators: # Cédric Anne, 2018 -# Kaya Zeren , 2019 +# Kaya Zeren , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" -"Last-Translator: Kaya Zeren , 2019\n" +"Last-Translator: Kaya Zeren , 2020\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/teclib/teams/28042/tr_TR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -237,7 +237,7 @@ msgstr "Dosya içine" msgid "From the model" msgstr "Modelden" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr "Belirlenmemiş" @@ -388,7 +388,7 @@ msgstr "Bu varlığa erişme izniniz yok" #: inc/computerinjection.class.php:72 msgid "Antivirus name" -msgstr "" +msgstr "Antivirus adı" #: inc/modelcsv.class.php:160 msgid "Specific file format options" @@ -426,50 +426,50 @@ msgstr "-------Bir tablo seçin-------" msgid "-------Choose a field-------" msgstr "-------Bir alan seçin-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "CSV dosyasından ekle" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "CSV dosyasından güncelle" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "Veri alma izni yok" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "Veri güncelleme izni yok" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "Eklenen değerin boyutu çok genişleyebilir" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "Alma işlemine izin verilmiyor" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "Alma işlemi yapılamadı" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "En az bir zorunlu alan bulunamadı" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "Eklenecek veri doğru" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "Bir verinin türü iyi değil" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "Uyarı" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "Veri bulunamadı" diff --git a/locales/zh_CN.po b/locales/zh_CN.po index cbf50114..31abd372 100644 --- a/locales/zh_CN.po +++ b/locales/zh_CN.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-10 10:45+0000\n" +"POT-Creation-Date: 2020-10-27 14:24+0000\n" "PO-Revision-Date: 2018-06-21 12:57+0000\n" "Last-Translator: liAnGjiA , 2020\n" "Language-Team: Chinese (China) (https://www.transifex.com/teclib/teams/28042/zh_CN/)\n" @@ -230,7 +230,7 @@ msgstr "" msgid "From the model" msgstr "" -#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1957 +#: inc/model.class.php:1371 inc/commoninjectionlib.class.php:1959 msgid "Undetermined" msgstr " 未确定的" @@ -417,50 +417,50 @@ msgstr "-------选择表-------" msgid "-------Choose a field-------" msgstr "-------选择字段-------" -#: inc/commoninjectionlib.class.php:1874 +#: inc/commoninjectionlib.class.php:1876 msgid "Add from CSV file" msgstr "从CSV文件添加" -#: inc/commoninjectionlib.class.php:1876 +#: inc/commoninjectionlib.class.php:1878 msgid "Update from CSV file" msgstr "从CSV文件更新" -#: inc/commoninjectionlib.class.php:1917 +#: inc/commoninjectionlib.class.php:1919 msgid "No right to import data" msgstr "无权导入数据" -#: inc/commoninjectionlib.class.php:1921 +#: inc/commoninjectionlib.class.php:1923 msgid "No right to update data" msgstr "无权更新数据" -#: inc/commoninjectionlib.class.php:1925 +#: inc/commoninjectionlib.class.php:1927 msgid "Size of the inserted value is to expansive" msgstr "" -#: inc/commoninjectionlib.class.php:1929 +#: inc/commoninjectionlib.class.php:1931 msgid "Import not allowed" msgstr "禁止导入" -#: inc/commoninjectionlib.class.php:1933 +#: inc/commoninjectionlib.class.php:1935 msgid "Import failed" msgstr "导入失败" -#: inc/commoninjectionlib.class.php:1937 +#: inc/commoninjectionlib.class.php:1939 msgid "At least one mandatory field is not present" msgstr "至少有一个必填字段还没有" -#: inc/commoninjectionlib.class.php:1941 +#: inc/commoninjectionlib.class.php:1943 msgid "Data to insert are correct" msgstr "插入数据正确" -#: inc/commoninjectionlib.class.php:1945 +#: inc/commoninjectionlib.class.php:1947 msgid "One data is not the good type" msgstr "一个数据类型不对" -#: inc/commoninjectionlib.class.php:1949 +#: inc/commoninjectionlib.class.php:1951 msgid "Warning" msgstr "警告" -#: inc/commoninjectionlib.class.php:1953 +#: inc/commoninjectionlib.class.php:1955 msgid "Data not found" msgstr "数据未找到" diff --git a/setup.php b/setup.php index ec1b5023..a225409e 100644 --- a/setup.php +++ b/setup.php @@ -28,7 +28,7 @@ @since 2009 ---------------------------------------------------------------------- */ -define ('PLUGIN_DATAINJECTION_VERSION', '2.8.0'); +define ('PLUGIN_DATAINJECTION_VERSION', '2.8.1'); // Minimal GLPI version, inclusive define("PLUGIN_DATAINJECTION_MIN_GLPI", "9.5");