From 54af8c3794f3a8abe7263cf537d782d32b382b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 8 Nov 2019 15:24:42 +0100 Subject: [PATCH 1/7] Update PHP dependencies --- composer.lock | 149 +++++++++++++++++++++++++------------------------- 1 file changed, 75 insertions(+), 74 deletions(-) diff --git a/composer.lock b/composer.lock index 87774d5..d74b7a6 100644 --- a/composer.lock +++ b/composer.lock @@ -377,20 +377,20 @@ }, { "name": "consolidation/robo", - "version": "1.4.9", + "version": "1.4.11", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345" + "reference": "5fa1d901776a628167a325baa9db95d8edf13a80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345", - "reference": "5c6b3840a45afda1cbffbb3bb1f94dd5f9f83345", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/5fa1d901776a628167a325baa9db95d8edf13a80", + "reference": "5fa1d901776a628167a325baa9db95d8edf13a80", "shasum": "" }, "require": { - "consolidation/annotated-command": "^2.10.2", + "consolidation/annotated-command": "^2.11.0", "consolidation/config": "^1.2", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", @@ -420,6 +420,7 @@ "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" }, "suggest": { @@ -481,7 +482,7 @@ } ], "description": "Modern task runner", - "time": "2019-03-19T18:07:19+00:00" + "time": "2019-10-29T15:50:02+00:00" }, { "name": "consolidation/self-update", @@ -625,20 +626,20 @@ }, { "name": "glpi-project/coding-standard", - "version": "0.7.1", + "version": "0.7.2", "source": { "type": "git", "url": "https://github.com/glpi-project/coding-standard.git", - "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03" + "reference": "dbba6566e1ce7f7d0778794cd6e93bc07080c8c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/1cef37d764aecf8fd7d5d167db25da97e289cb03", - "reference": "1cef37d764aecf8fd7d5d167db25da97e289cb03", + "url": "https://api.github.com/repos/glpi-project/coding-standard/zipball/dbba6566e1ce7f7d0778794cd6e93bc07080c8c7", + "reference": "dbba6566e1ce7f7d0778794cd6e93bc07080c8c7", "shasum": "" }, "require": { - "squizlabs/php_codesniffer": "^3.3" + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "notification-url": "https://packagist.org/downloads/", @@ -658,7 +659,7 @@ "glpi", "phpcs" ], - "time": "2018-06-07T08:45:05+00:00" + "time": "2019-10-31T10:30:33+00:00" }, { "name": "glpi-project/tools", @@ -1010,16 +1011,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -1028,7 +1029,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1053,20 +1054,20 @@ "psr", "psr-3" ], - "time": "2018-11-20T15:27:04+00:00" + "time": "2019-11-01T11:05:21+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.4.2", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8" + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", - "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", + "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", "shasum": "" }, "require": { @@ -1104,20 +1105,20 @@ "phpcs", "standards" ], - "time": "2019-04-10T23:49:02+00:00" + "time": "2019-10-28T04:36:32+00:00" }, { "name": "symfony/console", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c4d2f3529755ffc0be9fb823583b28d8744eeb3d" + "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c4d2f3529755ffc0be9fb823583b28d8744eeb3d", - "reference": "c4d2f3529755ffc0be9fb823583b28d8744eeb3d", + "url": "https://api.github.com/repos/symfony/console/zipball/c7edffb26b29cae972ca4afccb610a38ce8d0ccf", + "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf", "shasum": "" }, "require": { @@ -1176,20 +1177,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-06-05T11:33:52+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/debug", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "1172dc1abe44dfadd162239153818b074e6e53bf" + "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/1172dc1abe44dfadd162239153818b074e6e53bf", - "reference": "1172dc1abe44dfadd162239153818b074e6e53bf", + "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086", + "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086", "shasum": "" }, "require": { @@ -1232,20 +1233,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-06-18T21:26:03+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f18fdd6cc7006441865e698420cee26bac94741f" + "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f18fdd6cc7006441865e698420cee26bac94741f", - "reference": "f18fdd6cc7006441865e698420cee26bac94741f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127d4a2450760f81a8677fe8a10177", + "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177", "shasum": "" }, "require": { @@ -1295,20 +1296,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-06-25T07:45:31+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "70adda061ef83bb7def63a17953dc41f203308a7" + "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/70adda061ef83bb7def63a17953dc41f203308a7", - "reference": "70adda061ef83bb7def63a17953dc41f203308a7", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", + "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", "shasum": "" }, "require": { @@ -1345,20 +1346,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-06-23T09:29:17+00:00" + "time": "2019-08-20T13:31:17+00:00" }, { "name": "symfony/finder", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208" + "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/5f80266a729e30bbcc37f8bf0e62c3d5a38c8208", - "reference": "5f80266a729e30bbcc37f8bf0e62c3d5a38c8208", + "url": "https://api.github.com/repos/symfony/finder/zipball/3e915e5ce305f8bc8017597f71f1f4095092ddf8", + "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8", "shasum": "" }, "require": { @@ -1394,20 +1395,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-05-30T15:47:52+00:00" + "time": "2019-10-30T12:43:22+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "82ebae02209c21113908c229e9883c419720738a" + "reference": "550ebaac289296ce228a706d0867afc34687e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", - "reference": "82ebae02209c21113908c229e9883c419720738a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4", "shasum": "" }, "require": { @@ -1419,7 +1420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -1435,13 +1436,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -1452,20 +1453,20 @@ "polyfill", "portable" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -1477,7 +1478,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -1511,20 +1512,20 @@ "portable", "shim" ], - "time": "2019-02-06T07:57:58+00:00" + "time": "2019-08-06T08:03:45+00:00" }, { "name": "symfony/process", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d129c017e8602507688ef2c3007951a16c1a8407" + "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d129c017e8602507688ef2c3007951a16c1a8407", - "reference": "d129c017e8602507688ef2c3007951a16c1a8407", + "url": "https://api.github.com/repos/symfony/process/zipball/c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", + "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", "shasum": "" }, "require": { @@ -1560,20 +1561,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-05-30T15:47:52+00:00" + "time": "2019-10-24T15:33:53+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.29", + "version": "v3.4.33", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996" + "reference": "dab657db15207879217fc81df4f875947bf68804" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/212a27b731e5bfb735679d1ffaac82bd6a1dc996", - "reference": "212a27b731e5bfb735679d1ffaac82bd6a1dc996", + "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df4f875947bf68804", + "reference": "dab657db15207879217fc81df4f875947bf68804", "shasum": "" }, "require": { @@ -1619,7 +1620,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-03-25T07:48:46+00:00" + "time": "2019-10-24T15:33:53+00:00" } ], "aliases": [], From 090f170b3685c0d714ac6090bc6f1f51566cfc14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Thu, 14 Nov 2019 12:23:21 +0100 Subject: [PATCH 2/7] Whitelist autocomplete fields --- inc/model.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/inc/model.class.php b/inc/model.class.php index 6794d26..ad2cc0a 100644 --- a/inc/model.class.php +++ b/inc/model.class.php @@ -684,6 +684,7 @@ function rawSearchOptions() { 'name' => __('Name'), 'datatype' => 'itemlink', 'itemlink_type' => $this->getType(), + 'autocomplete' => true, ]; $tab[] = [ From b1ba08f4606f7e36424102c72da3ad14aad0b6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 11:17:17 +0100 Subject: [PATCH 3/7] Update locales --- locales/en_GB.mo | Bin 5368 -> 5368 bytes locales/en_GB.po | 30 +++++++++++++++--------------- locales/ru_RU.mo | Bin 2832 -> 2839 bytes locales/ru_RU.po | 4 ++-- locales/uninstall.pot | 24 ++++++++++++------------ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/locales/en_GB.mo b/locales/en_GB.mo index 9075a5cf6ee652af996ebc3692b1008746725981..fbbd89786c357207ee03fafd5a749a02a5d83fbe 100644 GIT binary patch delta 46 ocmeyN`9pJqEH9stfv$m(u7SCNp@Eg5*<@{ADKw$Y!Msb^0UMbMD*ylh delta 46 ocmeyN`9pJqEH9s-rLKXwu7QPup|O>b(PV92DKw$Y!Msb^0Um=3M*si- diff --git a/locales/en_GB.po b/locales/en_GB.po index 9a031f4..43ef174 100644 --- a/locales/en_GB.po +++ b/locales/en_GB.po @@ -1,14 +1,14 @@ # English translations for PACKAGE package. -# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER +# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2019. +# Automatically generated, 2020. # 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: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-02-07 10:16+0000\n" +"PO-Revision-Date: 2020-02-07 10:16+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -53,11 +53,11 @@ msgstr "Location preferences" 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:106 inc/model.class.php:987 inc/model.class.php:1029 msgid "Uninstallation" msgstr "Uninstallation" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:108 inc/model.class.php:989 inc/model.class.php:1031 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "Replacement" @@ -86,11 +86,11 @@ msgstr "Keep + Comment" msgid "Replacing data" msgstr "Replacing data" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:210 inc/model.class.php:830 msgid "Type of template" msgstr "Type of template" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:219 inc/model.class.php:794 msgid "Transfer's model to use" msgstr "Transfer's model to use" @@ -98,7 +98,7 @@ msgstr "Transfer's model to use" 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:251 inc/model.class.php:840 msgid "Action on group" msgstr "Action on group" @@ -118,11 +118,11 @@ msgstr "Manage templates" msgid "Erase datas" msgstr "Erase datas" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:301 inc/model.class.php:702 msgid "Delete software history (computers)" msgstr "Delete software history (computers)" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:306 inc/model.class.php:860 msgid "Delete the whole history" msgstr "Delete the whole history" @@ -138,7 +138,7 @@ msgstr "General informations" 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:849 inc/replace.class.php:567 +#: inc/model.class.php:418 inc/model.class.php:850 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "Archiving method of the old material" @@ -172,11 +172,11 @@ msgstr[1] "OCSNG links" 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:592 inc/model.class.php:813 msgid "Delete computer in OCSNG" msgstr "Delete computer in OCSNG" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:598 inc/model.class.php:821 msgid "Delete link with computer in OCSNG" msgstr "Delete link with computer in OCSNG" @@ -192,7 +192,7 @@ msgstr "Additionnal fields" msgid "Delete Fields plugin informations" msgstr "Delete Fields plugin informations" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:994 inc/uninstall.class.php:762 msgid "Keep in the current group" msgstr "Keep in the current group" diff --git a/locales/ru_RU.mo b/locales/ru_RU.mo index e0fddcc65b4f0232329c247c4a4bbd34864b87df..42cdff8f9d48287a59b1a7b3a2aee65374434139 100644 GIT binary patch delta 248 zcmWm8y$eBc7{&49<$6m}a%J$Ex^8SHQWnJ^Nm*?M6G>JXZ8oFb>JLx`tI1$jHk&~i ze1FsD4Cm=NJ9}^Me(R=JI{Kxeq*p-7U?eEzu#66Nv5s>r;SpWDVH&?^`iYQKz#3L? zgl*iQgI7%98><)yYpg7x7M6NA#4R2$j&4MXVgt>v4w{D(Y~dP{c*Yps(cC@J4EdZM To~17|%?~Ea#cXxzTNmpO0dO6& delta 241 zcmWm8Aq)X=6vy%3ImaNO*~)=uUNqkn*E$h1_Ny46i2v5 zAJ16E7Y6uq6{^M%WTXj>af^E_pqJ$+cF+_Xpm`W#AD39f6Xx-TCig&79|k HnR9XeO5ht_ diff --git a/locales/ru_RU.po b/locales/ru_RU.po index 4bafbcc..179fcc7 100644 --- a/locales/ru_RU.po +++ b/locales/ru_RU.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Nikolay , 2018 +# Nikolai Petrov , 2018 # #, fuzzy msgid "" @@ -13,7 +13,7 @@ msgstr "" "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: Nikolay , 2018\n" +"Last-Translator: Nikolai Petrov , 2018\n" "Language-Team: Russian (Russia) (https://www.transifex.com/teclib/teams/28042/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/locales/uninstall.pot b/locales/uninstall.pot index 3e95191..d359cf4 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: 2019-07-08 13:22+0000\n" +"POT-Creation-Date: 2020-02-07 10:16+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -54,11 +54,11 @@ msgstr "" 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:106 inc/model.class.php:987 inc/model.class.php:1029 msgid "Uninstallation" msgstr "" -#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030 +#: inc/model.class.php:108 inc/model.class.php:989 inc/model.class.php:1031 #: inc/replace.class.php:61 inc/replace.class.php:108 msgid "Replacement" msgstr "" @@ -87,11 +87,11 @@ msgstr "" msgid "Replacing data" msgstr "" -#: inc/model.class.php:210 inc/model.class.php:829 +#: inc/model.class.php:210 inc/model.class.php:830 msgid "Type of template" msgstr "" -#: inc/model.class.php:219 inc/model.class.php:793 +#: inc/model.class.php:219 inc/model.class.php:794 msgid "Transfer's model to use" msgstr "" @@ -99,7 +99,7 @@ msgstr "" msgid "New status of the computer" msgstr "" -#: inc/model.class.php:251 inc/model.class.php:839 +#: inc/model.class.php:251 inc/model.class.php:840 msgid "Action on group" msgstr "" @@ -119,11 +119,11 @@ msgstr "" msgid "Erase datas" msgstr "" -#: inc/model.class.php:301 inc/model.class.php:701 +#: inc/model.class.php:301 inc/model.class.php:702 msgid "Delete software history (computers)" msgstr "" -#: inc/model.class.php:306 inc/model.class.php:859 +#: inc/model.class.php:306 inc/model.class.php:860 msgid "Delete the whole history" msgstr "" @@ -139,7 +139,7 @@ msgstr "" 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:418 inc/model.class.php:850 inc/replace.class.php:567 msgid "Archiving method of the old material" msgstr "" @@ -171,11 +171,11 @@ msgstr[1] "" 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:592 inc/model.class.php:813 msgid "Delete computer in OCSNG" msgstr "" -#: inc/model.class.php:598 inc/model.class.php:820 +#: inc/model.class.php:598 inc/model.class.php:821 msgid "Delete link with computer in OCSNG" msgstr "" @@ -191,7 +191,7 @@ msgstr "" msgid "Delete Fields plugin informations" msgstr "" -#: inc/model.class.php:993 inc/uninstall.class.php:762 +#: inc/model.class.php:994 inc/uninstall.class.php:762 msgid "Keep in the current group" msgstr "" From 93afdfce17cde28e800e0c51ef73dd9f0a89e4d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 11:17:58 +0100 Subject: [PATCH 4/7] Add English (United States) locale --- locales/en_US.mo | Bin 0 -> 5450 bytes locales/en_US.po | 307 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 307 insertions(+) create mode 100644 locales/en_US.mo create mode 100644 locales/en_US.po diff --git a/locales/en_US.mo b/locales/en_US.mo new file mode 100644 index 0000000000000000000000000000000000000000..b25ef30b6f3300e314eb02814b0df817f19d6c45 GIT binary patch literal 5450 zcmeH~TZm*w8OLkmW@1K-W;GkHYpuHOw7WgiJsaIg&+eMZ+#EAEw`W&!APXu8DjJ9)fK(%oY=!51UK z7W4J*T&ljR@2h{+srkdPqmLTO3if7f{WfDf`0=Css7x61YH$R;65b7u!4vQvScR{E ztMFb}hwp&b;H%&l;G5vrp@lzyuYu3Nlkm^*ZSbx;jCnn*LfyX~z8!Y+=U;^C_eppc z{2^4ozksiUzk_Q3EYvtAUT(}Ocmlo=F2O1IFnk024AeLthl=|K)VO~Q-wOW@)!#jL zX8lb;wL1@w!w*3IOq(C|A3^#1bpHG?hzs+0{{Gug-|Tfbv^{gl?9g+O0$W%sxNr?^95D`wG;&eGAg1`4K!1 ze+FlvCRuqu2NmxJq4N1LsQ5k$)$XfM{=NxS?*{zd5o3M{rI+ixp!)qtejh;T7@!a?oBAY#8CZx397#*pxS*G zD*wNN%G;ly^zs)df49>}&yPdt#X`L=L5<@QRQnI-?|ZPq{Q*?Io`llN_hAYC5h{*5 z333z8K@;9jd{s|SwaR#G#I|Vh)c__Us!&&$VsJwp% zD&F5f<@GtJ_$FwqcK1U0I|)^<0+CBv|L1V_5n-<38Z}xf|BiUV!0XsO-*uX?S=ifi zjl?FQ^=#k3)M)$r&W3w7>@;l`N0ILp&;6ifyDn*mO;t$R)Elp~ zSifpB2UIkR?a*(y*zSdq^%<4AjT~cZIJ3yG7zv|`?Z8jkHpE#p>@GG-uHzDC&)CJV z+jT)wJXlEsvAs^eM~gyS+Z6=A~Wf$Gln#_VEx#2REy-wOHR=Enal| z;954GaW99e#Nl2t@FHj1ek`AMs;C;53O7p3pdEIGmCTYKDe;X_*k-xgOAc%&Y^1|C z%aIp5+w>AIHmfdh5wmtEytT1di#(>8SyOKP*aqRi_5(kN6R*>8P4fcJv-r~4wx{B( zRz59FyL*r;BMjV&yn10DQiz8lkwxL+bZpmsba&9`WIo3q*s0-=OKFF^EOKJKJD)K zYQr3-ihW+qbVaHcTntr+7@F2&rSG$oH1RiHD+rTO&9n9(?At*YoKEbnv)(Sthw=9r zrJQC9J>5*abdS;&v)zwc&Rlj~KWL(qJc(mdpYLka2=`snrrF6-o9;SmOEk`Qq?|UN zk7gA1n&BYOipVz`MWKBrubC=q?Apft25N}+`klOrG^+(|>W+Al#A~z}Lo;mj)3)_? z7$uE<5}Td2Bg(Ls?T2B&Zk&o<@fV7SbtR9Z7-&bT3x7(xCOgYcx`QWrA7ugNx=EX) z+TfK}ywrGx`*h|utuye(+V38ioyZGfbkF+BHjr$B%+5hC>#+FtTq*V;GrY>Sxx=^P zIopoHkFrOW*P7+4F4DeTv)c=c4=t=N+pEi$>uXz^lcbxRl{ey+-z-1aZ^h-Eux2N> zw|2^lkxP3hFCny=ovl>wFIUc&D|5Dbt~NV+rb3}&`7(=J&PVmAR4rG|+1c4zwUX6a z_u{0S2FsT;jB2*t_Rzw5Nd7Mj+^*MXg#93iAGmg{H62E+OJ~y#C)d58)n_j#?>Mhp zv&%uN-Q=F4?JelJw%*%*a_Qyx2nc$hkH9Gz-@VfEL>|Eu( z*%=o+e5F29n%r31SRSROI$fFME1EEKWu?Ey{_{vOgP8qb-Zt7^6uac&m7SIH+^AkY zedXn#5jGK1&Cc!m$#B>;oAx!yD&_N2Ug6ss*KC0Pxs5N*&TA=fd2uSRCokG+iGOr% zb_CfeWKbMI_?BfK?iW3QZ2W(pK#H$_v0~ZU{u>97dT{`GUvU6g%uhW3!2x9K+;#H< z2&=~%o0>qhci<&BeT>WE*5QNCZ~nPW ezo^;2R4>Wlqkik~QLKQ`kz;gq)5FJD&i(~;yUFzc literal 0 HcmV?d00001 diff --git a/locales/en_US.po b/locales/en_US.po new file mode 100644 index 0000000..cffb40c --- /dev/null +++ b/locales/en_US.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: +# Shawn Long , 2019 +# +#, 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: Shawn Long , 2019\n" +"Language-Team: English (United States) (https://www.transifex.com/teclib/teams/28042/en_US/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en_US\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: front/action.php:55 inc/replace.class.php:476 +msgid "Replacement successful" +msgstr "Replacement Successful" + +#: front/action.php:96 inc/uninstall.class.php:324 +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 +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 +msgid "Uninstallation" +msgstr "Uninstallation" + +#: 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 "Replacement" + +#: inc/model.class.php:118 +msgid "PDF Archiving" +msgstr "PDF Archiving" + +#: inc/model.class.php:120 +msgid "CSV Archiving" +msgstr "CSV Archiving" + +#: inc/model.class.php:123 +msgid "Purge" +msgstr "Purge" + +#: inc/model.class.php:124 +msgid "Delete + Comment" +msgstr "Delete + Comment" + +#: inc/model.class.php:125 +msgid "Keep + Comment" +msgstr "Keep + Comment" + +#: inc/model.class.php:166 +msgid "Replacing data" +msgstr "Replacing data" + +#: inc/model.class.php:210 inc/model.class.php:829 +msgid "Type of template" +msgstr "Type of Template" + +#: inc/model.class.php:219 inc/model.class.php:793 +msgid "Transfer's model to use" +msgstr "Transfer's model to use" + +#: inc/model.class.php:239 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 +msgid "Action on group" +msgstr "Action on group" + +#: inc/model.class.php:263 +msgid "New group" +msgstr "New Group" + +#: inc/model.class.php:284 +msgid "Add template" +msgstr "Add Template" + +#: inc/model.class.php:287 +msgid "Manage templates" +msgstr "Manage Templates" + +#: inc/model.class.php:298 +msgid "Erase datas" +msgstr "Erase Data" + +#: inc/model.class.php:301 inc/model.class.php:701 +msgid "Delete software history (computers)" +msgstr "Delete Software History (Computers)" + +#: inc/model.class.php:306 inc/model.class.php:859 +msgid "Delete the whole history" +msgstr "Delete the whole history" + +#: inc/model.class.php:388 inc/model.class.php:438 +msgid "Informations replacement" +msgstr "Information Replacement" + +#: inc/model.class.php:389 inc/replace.class.php:549 +msgid "General informations" +msgstr "General Information" + +#: inc/model.class.php:411 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 +msgid "Archiving method of the old material" +msgstr "Archiving method of the old material" + +#: inc/model.class.php:428 +msgid "Plugin PDF is installed and activated" +msgstr "Plugin PDF is installed and activated" + +#: inc/model.class.php:431 +msgid "" +"Plugin PDF is not installed, you won't be able to use PDF format for " +"archiving" +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 +msgid "Connections with other materials" +msgstr "Connections with other materials" + +#: inc/model.class.php:513 inc/replace.class.php:660 +msgid "Direct connections" +msgstr "Direct Connections" + +#: inc/model.class.php:586 +msgid "OCSNG link" +msgid_plural "OCSNG links" +msgstr[0] "OCSNG link" +msgstr[1] "OCSNG links" + +#: inc/model.class.php:588 +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 +msgid "Delete computer in OCSNG" +msgstr "Delete computer in OCSNG" + +#: inc/model.class.php:598 inc/model.class.php:820 +msgid "Delete link with computer in OCSNG" +msgstr "Delete link with computer in OCSNG" + +#: inc/model.class.php:612 +msgid "Delete computer in FusionInventory" +msgstr "Delete computer in FusionInventory" + +#: inc/model.class.php:624 +msgid "Additionnal fields" +msgstr "Additional Fields" + +#: inc/model.class.php:628 +msgid "Delete Fields plugin informations" +msgstr "Delete Fields plugin information" + +#: inc/model.class.php:993 inc/uninstall.class.php:762 +msgid "Keep in the current group" +msgstr "Keep in the current group" + +#: inc/preference.class.php:54 +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/uninstall.class.php:815 +msgid "Lifecycle" +msgstr "Lifecycle" + +#: inc/replace.class.php:40 +msgid "Item's replacement" +msgstr "Item's replacement" + +#: inc/replace.class.php:65 +msgid "Please wait, replacement is running..." +msgstr "Please wait, replacement is running..." + +#: inc/replace.class.php:130 +msgid "This document is the archive of this replaced item" +msgstr "This document is the archive of this replaced item" + +#: inc/replace.class.php:135 +msgid "Archive of old material" +msgstr "Archive of old material" + +#: inc/replace.class.php:409 +msgid "See attached document" +msgstr "See attached document" + +#: inc/replace.class.php:498 +msgid "This item is a replacement for item" +msgstr "This item is a replacement for item" + +#: inc/replace.class.php:500 +msgid "This item was replaced by" +msgstr "This item was replaced by" + +#: inc/replace.class.php:548 inc/replace.class.php:624 +msgid "Reminder of the replacement model" +msgstr "Reminder of the replacement model" + +#: inc/replace.class.php:586 +msgid "New location of item" +msgstr "New location of item" + +#: inc/replace.class.php:671 +msgid "Choices for item to replace" +msgstr "Choices for item to replace" + +#: inc/replace.class.php:674 +msgid "Old item" +msgstr "Old item" + +#: inc/replace.class.php:684 +msgid "New item" +msgstr "New item" + +#: inc/replace.class.php:719 +msgid "Replace" +msgstr "Replace" + +#: setup.php:111 +msgid "Item's Lifecycle (uninstall)" +msgstr "Item's Lifecycle (uninstall)" From 71855405f3fc368d3328f85350bb40285146ee09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 11:18:39 +0100 Subject: [PATCH 5/7] Add Korean (Korea) locale --- locales/ko_KR.mo | Bin 0 -> 5475 bytes locales/ko_KR.po | 304 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 304 insertions(+) create mode 100644 locales/ko_KR.mo create mode 100644 locales/ko_KR.po diff --git a/locales/ko_KR.mo b/locales/ko_KR.mo new file mode 100644 index 0000000000000000000000000000000000000000..383f4e00946ef5bbfa1710e1419bba79797af431 GIT binary patch literal 5475 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 Ef4(-Z5dZ)H literal 0 HcmV?d00001 diff --git a/locales/ko_KR.po b/locales/ko_KR.po new file mode 100644 index 0000000..b178210 --- /dev/null +++ b/locales/ko_KR.po @@ -0,0 +1,304 @@ +# 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: +# SeongHyeon Cho , 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: SeongHyeon Cho , 2020\n" +"Language-Team: Korean (Korea) (https://www.transifex.com/teclib/teams/28042/ko_KR/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ko_KR\n" +"Plural-Forms: nplurals=1; plural=0;\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" +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 +msgid "Uninstallation" +msgstr "제거" + +#: 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 "교체" + +#: inc/model.class.php:118 +msgid "PDF Archiving" +msgstr "PDF 보관" + +#: inc/model.class.php:120 +msgid "CSV Archiving" +msgstr "CSV 보관" + +#: inc/model.class.php:123 +msgid "Purge" +msgstr "제거" + +#: inc/model.class.php:124 +msgid "Delete + Comment" +msgstr "삭제 + 댓글" + +#: inc/model.class.php:125 +msgid "Keep + Comment" +msgstr "유지 + 댓글" + +#: inc/model.class.php:166 +msgid "Replacing data" +msgstr "데이터 교체" + +#: inc/model.class.php:210 inc/model.class.php:829 +msgid "Type of template" +msgstr "견본 유형" + +#: inc/model.class.php:219 inc/model.class.php:793 +msgid "Transfer's model to use" +msgstr "사용할 전송 모델" + +#: inc/model.class.php:239 inc/replace.class.php:603 +msgid "New status of the computer" +msgstr "컴퓨터의 새 상태" + +#: inc/model.class.php:251 inc/model.class.php:839 +msgid "Action on group" +msgstr "그룹에서의 동작" + +#: inc/model.class.php:263 +msgid "New group" +msgstr "새 그룹" + +#: inc/model.class.php:284 +msgid "Add template" +msgstr "견본 추가" + +#: inc/model.class.php:287 +msgid "Manage templates" +msgstr "견본 관리" + +#: inc/model.class.php:298 +msgid "Erase datas" +msgstr "데이터 소거" + +#: inc/model.class.php:301 inc/model.class.php:701 +msgid "Delete software history (computers)" +msgstr "소프트웨어 이력 삭제 (컴퓨터)" + +#: inc/model.class.php:306 inc/model.class.php:859 +msgid "Delete the whole history" +msgstr "전체 이력 삭제" + +#: inc/model.class.php:388 inc/model.class.php:438 +msgid "Informations replacement" +msgstr "교체 정보" + +#: inc/model.class.php:389 inc/replace.class.php:549 +msgid "General informations" +msgstr "일반 정보" + +#: inc/model.class.php:411 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 +msgid "Archiving method of the old material" +msgstr "이전 자료의 보관 방법" + +#: inc/model.class.php:428 +msgid "Plugin PDF is installed and activated" +msgstr "플러그인 PDF가 설치되어 활성화 되었습니다" + +#: inc/model.class.php:431 +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 +msgid "Connections with other materials" +msgstr "다른 자료와 연결" + +#: inc/model.class.php:513 inc/replace.class.php:660 +msgid "Direct connections" +msgstr "직접 연결" + +#: inc/model.class.php:586 +msgid "OCSNG link" +msgid_plural "OCSNG links" +msgstr[0] "OCSNG 링크" + +#: inc/model.class.php:588 +msgid "These options only apply to computers coming from OCSNG" +msgstr "이 옵션들은 OCSNG에서 가져온 컴퓨터들에만 적용됩니다" + +#: inc/model.class.php:592 inc/model.class.php:812 +msgid "Delete computer in OCSNG" +msgstr "OCSNG에서 컴퓨터 삭제" + +#: inc/model.class.php:598 inc/model.class.php:820 +msgid "Delete link with computer in OCSNG" +msgstr "OCSNG에서 컴퓨터와의 연결 삭제" + +#: inc/model.class.php:612 +msgid "Delete computer in FusionInventory" +msgstr "FusionInventory에서 컴퓨터 삭제" + +#: inc/model.class.php:624 +msgid "Additionnal fields" +msgstr "추가 항목" + +#: inc/model.class.php:628 +msgid "Delete Fields plugin informations" +msgstr "항목 플러그인 정보 삭제" + +#: inc/model.class.php:993 inc/uninstall.class.php:762 +msgid "Keep in the current group" +msgstr "현재 그룹 유지" + +#: inc/preference.class.php:54 +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/uninstall.class.php:815 +msgid "Lifecycle" +msgstr "주기" + +#: inc/replace.class.php:40 +msgid "Item's replacement" +msgstr "품목 대체" + +#: inc/replace.class.php:65 +msgid "Please wait, replacement is running..." +msgstr "기다리세요, 교체 중입니다..." + +#: inc/replace.class.php:130 +msgid "This document is the archive of this replaced item" +msgstr "이 문서는 이 교체된 품목의 보관입니다" + +#: inc/replace.class.php:135 +msgid "Archive of old material" +msgstr "이전 자료의 보관" + +#: inc/replace.class.php:409 +msgid "See attached document" +msgstr "첨부된 문서 보기" + +#: inc/replace.class.php:498 +msgid "This item is a replacement for item" +msgstr "이 품목은 품목 교체용 입니다" + +#: inc/replace.class.php:500 +msgid "This item was replaced by" +msgstr "이 품목은 다음에 의해 교체됨" + +#: inc/replace.class.php:548 inc/replace.class.php:624 +msgid "Reminder of the replacement model" +msgstr "대체 모델의 알림" + +#: inc/replace.class.php:586 +msgid "New location of item" +msgstr "품목의 새 위치" + +#: inc/replace.class.php:671 +msgid "Choices for item to replace" +msgstr "대체할 품목 선택" + +#: inc/replace.class.php:674 +msgid "Old item" +msgstr "예전 품목" + +#: inc/replace.class.php:684 +msgid "New item" +msgstr "새 품목" + +#: inc/replace.class.php:719 +msgid "Replace" +msgstr "대체" + +#: setup.php:111 +msgid "Item's Lifecycle (uninstall)" +msgstr "품목 주기 (제거)" From e25d85d0537af798eeb6dfc7f8b27772d2bdb2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 11:19:49 +0100 Subject: [PATCH 6/7] Update PHP dependencies --- composer.lock | 104 +++++++++++++++++++++++++------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/composer.lock b/composer.lock index d74b7a6..a716401 100644 --- a/composer.lock +++ b/composer.lock @@ -1058,16 +1058,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.2", + "version": "3.5.4", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7" + "reference": "dceec07328401de6211037abbb18bda423677e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", - "reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dceec07328401de6211037abbb18bda423677e26", + "reference": "dceec07328401de6211037abbb18bda423677e26", "shasum": "" }, "require": { @@ -1105,20 +1105,20 @@ "phpcs", "standards" ], - "time": "2019-10-28T04:36:32+00:00" + "time": "2020-01-30T22:20:29+00:00" }, { "name": "symfony/console", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf" + "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c7edffb26b29cae972ca4afccb610a38ce8d0ccf", - "reference": "c7edffb26b29cae972ca4afccb610a38ce8d0ccf", + "url": "https://api.github.com/repos/symfony/console/zipball/7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", + "reference": "7c5bdd346f9d90a2d22d4e1fe61e02dc19b98f12", "shasum": "" }, "require": { @@ -1177,20 +1177,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-10T07:52:48+00:00" }, { "name": "symfony/debug", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086" + "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/f72e33fdb1170b326e72c3157f0cd456351dd086", - "reference": "f72e33fdb1170b326e72c3157f0cd456351dd086", + "url": "https://api.github.com/repos/symfony/debug/zipball/70dd18e93bb8bdf3c4db7fde832619fef9828cf8", + "reference": "70dd18e93bb8bdf3c4db7fde832619fef9828cf8", "shasum": "" }, "require": { @@ -1233,20 +1233,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-08T16:36:15+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177" + "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f9031c22ec127d4a2450760f81a8677fe8a10177", - "reference": "f9031c22ec127d4a2450760f81a8677fe8a10177", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/79ede8f2836e5ec910ebb325bde40f987244baa8", + "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8", "shasum": "" }, "require": { @@ -1296,20 +1296,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-04T12:05:51+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516" + "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", - "reference": "00e3a6ddd723b8bcfe4f2a1b6f82b98eeeb51516", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/0a0d3b4bda11aa3a0464531c40e681e184e75628", + "reference": "0a0d3b4bda11aa3a0464531c40e681e184e75628", "shasum": "" }, "require": { @@ -1346,20 +1346,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-08-20T13:31:17+00:00" + "time": "2020-01-17T08:50:08+00:00" }, { "name": "symfony/finder", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8" + "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3e915e5ce305f8bc8017597f71f1f4095092ddf8", - "reference": "3e915e5ce305f8bc8017597f71f1f4095092ddf8", + "url": "https://api.github.com/repos/symfony/finder/zipball/a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", + "reference": "a90a9d3b9f458a5cdeabfa4090b20c000ca3962f", "shasum": "" }, "require": { @@ -1395,20 +1395,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-10-30T12:43:22+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", "shasum": "" }, "require": { @@ -1420,7 +1420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -1453,20 +1453,20 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -1478,7 +1478,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -1512,20 +1512,20 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T14:18:11+00:00" }, { "name": "symfony/process", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e" + "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", - "reference": "c19da50bc3e8fa7d60628fdb4ab5d67de534cf3e", + "url": "https://api.github.com/repos/symfony/process/zipball/5b9d2bcffe4678911a4c941c00b7c161252cf09a", + "reference": "5b9d2bcffe4678911a4c941c00b7c161252cf09a", "shasum": "" }, "require": { @@ -1561,20 +1561,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-01T11:03:25+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.33", + "version": "v3.4.37", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "dab657db15207879217fc81df4f875947bf68804" + "reference": "aa46bc2233097d5212332c907f9911533acfbf80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/dab657db15207879217fc81df4f875947bf68804", - "reference": "dab657db15207879217fc81df4f875947bf68804", + "url": "https://api.github.com/repos/symfony/yaml/zipball/aa46bc2233097d5212332c907f9911533acfbf80", + "reference": "aa46bc2233097d5212332c907f9911533acfbf80", "shasum": "" }, "require": { @@ -1620,7 +1620,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-10-24T15:33:53+00:00" + "time": "2020-01-13T08:00:59+00:00" } ], "aliases": [], From d9dfff9dbeb76e8d610c89c3581a819d0a87d4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Fri, 7 Feb 2020 11:20:48 +0100 Subject: [PATCH 7/7] Add 2.6.3 version definition --- setup.php | 2 +- uninstall.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.php b/setup.php index c4953ea..e014597 100644 --- a/setup.php +++ b/setup.php @@ -28,7 +28,7 @@ @since 2009 ---------------------------------------------------------------------- */ -define ('PLUGIN_UNINSTALL_VERSION', '2.6.2'); +define ('PLUGIN_UNINSTALL_VERSION', '2.6.3'); // Minimal GLPI version, inclusive define("PLUGIN_UNINSTALL_MIN_GLPI", "9.3"); diff --git a/uninstall.xml b/uninstall.xml index 9d665da..71412b3 100644 --- a/uninstall.xml +++ b/uninstall.xml @@ -25,6 +25,11 @@ Remi Collet + + 2.6.3 + 9.4 + 9.3 + 2.6.2 9.4