diff options
Diffstat (limited to 'frontends/php/locale/ka/LC_MESSAGES/frontend.po')
| -rw-r--r-- | frontends/php/locale/ka/LC_MESSAGES/frontend.po | 2337 |
1 files changed, 1165 insertions, 1172 deletions
diff --git a/frontends/php/locale/ka/LC_MESSAGES/frontend.po b/frontends/php/locale/ka/LC_MESSAGES/frontend.po index ad403d46678..93b09fee7a9 100644 --- a/frontends/php/locale/ka/LC_MESSAGES/frontend.po +++ b/frontends/php/locale/ka/LC_MESSAGES/frontend.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Zabbix 4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-01-13 23:40+0200\n" +"POT-Creation-Date: 2019-02-03 01:45+0200\n" "PO-Revision-Date: 2016-03-28 08:39+0300\n" "Last-Translator: giomac <giomac@gmail.com>\n" "Language-Team: none\n" @@ -21,12 +21,12 @@ msgstr "" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 #, c-format msgid "\"%1$s\" is expected" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #, c-format msgid "\"%1$s\" value must be less than or equal to \"%2$s\" value" msgstr "" @@ -46,6 +46,13 @@ msgstr "\"%s\" უნდა იყოს 1970.01.01-სა და 2038.01.18-ს msgid "\"host:key\" pair is expected" msgstr "" +#: include/forms.inc.php:1475 +#: include/views/configuration.host.discovery.edit.php:714 +#: include/views/js/configuration.host.discovery.edit.js.php:52 +#: include/views/js/item.preprocessing.js.php:162 +msgid "$.path.to.node" +msgstr "" + #: include/classes/api/services/CDRule.php:520 #, c-format msgid "%1$d characters exceeds maximum length of %2$d characters" @@ -81,7 +88,7 @@ msgid "%1$s Item" msgid_plural "%1$s Items" msgstr[0] "%1$s ელემენტი" -#: include/classes/api/services/CItemGeneral.php:2227 +#: include/classes/api/services/CItemGeneral.php:2190 #: include/classes/import/readers/CXmlImportReader.php:46 #, c-format msgid "%1$s [Line: %2$s | Column: %3$s]" @@ -284,11 +291,11 @@ msgstr "" msgid "ADD OVERRIDE" msgstr "" -#: include/views/configuration.host.discovery.edit.php:439 -#: include/views/configuration.item.edit.php:565 -#: include/views/configuration.item.edit.php:572 -#: include/views/configuration.item.massupdate.php:248 -#: include/views/configuration.item.prototype.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:427 +#: include/views/configuration.item.edit.php:551 +#: include/views/configuration.item.edit.php:558 +#: include/views/configuration.item.massupdate.php:239 +#: include/views/configuration.item.prototype.edit.php:504 #: include/views/configuration.item.prototype.massupdate.php:235 #: include/views/js/configuration.discovery.edit.js.php:113 msgid "AES" @@ -360,6 +367,7 @@ msgstr "" #: app/views/popup.triggerwizard.php:47 app/views/popup.triggerwizard.php:80 #: include/actions.inc.php:1910 include/actions.inc.php:1994 #: include/audit.inc.php:29 include/classes/screens/CScreenActions.php:127 +#: include/forms.inc.php:1402 #: include/views/administration.auditacts.list.php:57 #: include/views/administration.auditlogs.list.php:42 #: include/views/administration.auditlogs.list.php:74 @@ -387,19 +395,15 @@ msgstr "" #: include/views/configuration.correlation.edit.php:48 #: include/views/configuration.correlation.edit.php:218 #: include/views/configuration.graph.edit.php:346 -#: include/views/configuration.host.discovery.edit.php:518 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:506 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/configuration.host.edit.php:546 #: include/views/configuration.host.prototype.edit.php:255 #: include/views/configuration.httpconf.edit.php:202 -#: include/views/configuration.item.edit.php:700 -#: include/views/configuration.item.edit.php:941 -#: include/views/configuration.item.massupdate.php:344 -#: include/views/configuration.item.massupdate.php:458 -#: include/views/configuration.item.prototype.edit.php:629 -#: include/views/configuration.item.prototype.edit.php:774 -#: include/views/configuration.item.prototype.massupdate.php:321 -#: include/views/configuration.item.prototype.massupdate.php:436 +#: include/views/configuration.item.edit.php:687 +#: include/views/configuration.item.massupdate.php:340 +#: include/views/configuration.item.prototype.edit.php:616 +#: include/views/configuration.item.prototype.massupdate.php:336 #: include/views/configuration.maintenance.edit.php:77 #: include/views/configuration.services.edit.php:117 #: include/views/configuration.services.edit.php:170 @@ -533,7 +537,7 @@ msgstr "" #: app/views/popup.httpstep.php:161 app/views/popup.media.php:48 #: app/views/popup.media.php:112 app/views/popup.triggerwizard.php:169 #: app/views/popup.triggerwizard.php:195 -#: include/classes/widgets/CWidgetHelper.php:420 +#: include/classes/widgets/CWidgetHelper.php:420 include/forms.inc.php:1615 #: include/views/administration.auditlogs.list.php:46 #: include/views/administration.general.iconmap.edit.php:101 #: include/views/administration.general.iconmap.edit.php:142 @@ -568,11 +572,12 @@ msgstr "" #: include/views/configuration.discovery.edit.php:118 #: include/views/configuration.graph.edit.php:390 #: include/views/configuration.graph.edit.php:473 -#: include/views/configuration.host.discovery.edit.php:114 -#: include/views/configuration.host.discovery.edit.php:209 -#: include/views/configuration.host.discovery.edit.php:554 -#: include/views/configuration.host.discovery.edit.php:674 -#: include/views/configuration.host.discovery.edit.php:713 +#: include/views/configuration.host.discovery.edit.php:113 +#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:542 +#: include/views/configuration.host.discovery.edit.php:662 +#: include/views/configuration.host.discovery.edit.php:727 +#: include/views/configuration.host.discovery.edit.php:775 #: include/views/configuration.host.edit.php:116 #: include/views/configuration.host.edit.php:132 #: include/views/configuration.host.edit.php:148 @@ -586,25 +591,21 @@ msgstr "" #: include/views/configuration.httpconf.edit.php:128 #: include/views/configuration.httpconf.edit.php:268 #: include/views/configuration.httpconf.edit.php:310 -#: include/views/configuration.item.edit.php:146 -#: include/views/configuration.item.edit.php:241 -#: include/views/configuration.item.edit.php:749 -#: include/views/configuration.item.edit.php:1148 -#: include/views/configuration.item.edit.php:1195 -#: include/views/configuration.item.massupdate.php:158 -#: include/views/configuration.item.massupdate.php:430 -#: include/views/configuration.item.massupdate.php:496 -#: include/views/configuration.item.massupdate.php:610 -#: include/views/configuration.item.prototype.edit.php:134 -#: include/views/configuration.item.prototype.edit.php:229 -#: include/views/configuration.item.prototype.edit.php:665 -#: include/views/configuration.item.prototype.edit.php:981 -#: include/views/configuration.item.prototype.edit.php:1014 +#: include/views/configuration.item.edit.php:148 +#: include/views/configuration.item.edit.php:240 +#: include/views/configuration.item.edit.php:736 +#: include/views/configuration.item.edit.php:957 +#: include/views/configuration.item.massupdate.php:156 +#: include/views/configuration.item.massupdate.php:378 +#: include/views/configuration.item.massupdate.php:492 +#: include/views/configuration.item.prototype.edit.php:133 +#: include/views/configuration.item.prototype.edit.php:225 +#: include/views/configuration.item.prototype.edit.php:652 +#: include/views/configuration.item.prototype.edit.php:779 #: include/views/configuration.item.prototype.massupdate.php:152 -#: include/views/configuration.item.prototype.massupdate.php:407 -#: include/views/configuration.item.prototype.massupdate.php:474 -#: include/views/configuration.item.prototype.massupdate.php:566 -#: include/views/configuration.item.prototype.massupdate.php:641 +#: include/views/configuration.item.prototype.massupdate.php:374 +#: include/views/configuration.item.prototype.massupdate.php:466 +#: include/views/configuration.item.prototype.massupdate.php:541 #: include/views/configuration.maintenance.edit.php:137 #: include/views/configuration.maintenance.edit.php:224 #: include/views/configuration.maintenance.edit.php:295 @@ -886,11 +887,11 @@ msgstr "ყველა შაბლონი" msgid "Allow manual close" msgstr "" -#: include/views/configuration.host.discovery.edit.php:576 -#: include/views/configuration.item.edit.php:852 -#: include/views/configuration.item.massupdate.php:575 -#: include/views/configuration.item.prototype.edit.php:721 -#: include/views/configuration.item.prototype.massupdate.php:556 +#: include/views/configuration.host.discovery.edit.php:565 +#: include/views/configuration.item.edit.php:837 +#: include/views/configuration.item.massupdate.php:457 +#: include/views/configuration.item.prototype.edit.php:710 +#: include/views/configuration.item.prototype.massupdate.php:456 msgid "Allowed hosts" msgstr "დაშვებული ჰოსტები" @@ -902,7 +903,7 @@ msgstr "ალტერნატიულად, თქვენ შეგიძ #: include/views/configuration.action.edit.php:112 #: include/views/configuration.action.edit.php:1150 #: include/views/configuration.correlation.edit.php:94 -#: include/views/configuration.host.discovery.edit.php:598 +#: include/views/configuration.host.discovery.edit.php:586 #: include/views/configuration.trigger.prototype.edit.php:130 #: include/views/configuration.trigger.prototype.edit.php:322 #: include/views/configuration.triggers.edit.php:151 @@ -916,7 +917,7 @@ msgstr "და" #: include/views/configuration.action.edit.php:111 #: include/views/configuration.action.edit.php:1149 #: include/views/configuration.correlation.edit.php:93 -#: include/views/configuration.host.discovery.edit.php:597 +#: include/views/configuration.host.discovery.edit.php:585 #: include/views/configuration.maintenance.edit.php:170 #: include/views/configuration.triggers.list.php:73 msgid "And/Or" @@ -977,8 +978,8 @@ msgid "Application error." msgstr "პროგრამის შეცდომა." #: app/controllers/CControllerPopupGeneric.php:136 -#: include/views/configuration.item.prototype.edit.php:751 -#: include/views/configuration.item.prototype.massupdate.php:637 +#: include/views/configuration.item.prototype.edit.php:741 +#: include/views/configuration.item.prototype.massupdate.php:537 msgid "Application prototypes" msgstr "აპლიკაციის პროტოტიპები" @@ -1005,12 +1006,12 @@ msgstr "" #: include/views/configuration.host.edit.php:304 #: include/views/configuration.host.list.php:129 #: include/views/configuration.host.list.php:320 -#: include/views/configuration.item.edit.php:887 +#: include/views/configuration.item.edit.php:872 #: include/views/configuration.item.list.php:70 -#: include/views/configuration.item.massupdate.php:636 -#: include/views/configuration.item.prototype.edit.php:736 +#: include/views/configuration.item.massupdate.php:518 +#: include/views/configuration.item.prototype.edit.php:726 #: include/views/configuration.item.prototype.list.php:58 -#: include/views/configuration.item.prototype.massupdate.php:562 +#: include/views/configuration.item.prototype.massupdate.php:462 #: include/views/configuration.template.edit.php:130 #: include/views/configuration.template.list.php:86 #: include/views/configuration.template.list.php:184 @@ -1043,7 +1044,7 @@ msgstr "" msgid "Apr" msgstr "აპრ" -#: include/forms.inc.php:1980 include/func.inc.php:119 +#: include/forms.inc.php:2228 include/func.inc.php:119 #: include/func.inc.php:256 jsLoader.php:136 msgid "April" msgstr "აპრილი" @@ -1068,16 +1069,16 @@ msgstr "" msgid "Area type" msgstr "" -#: include/items.inc.php:1742 +#: include/items.inc.php:1736 msgid "Arithmetic" msgstr "" -#: include/views/configuration.item.edit.php:822 -#: include/views/configuration.item.edit.php:828 -#: include/views/configuration.item.massupdate.php:551 -#: include/views/configuration.item.prototype.edit.php:701 -#: include/views/configuration.item.prototype.edit.php:707 -#: include/views/configuration.item.prototype.massupdate.php:532 +#: include/views/configuration.item.edit.php:807 +#: include/views/configuration.item.edit.php:813 +#: include/views/configuration.item.massupdate.php:434 +#: include/views/configuration.item.prototype.edit.php:688 +#: include/views/configuration.item.prototype.edit.php:694 +#: include/views/configuration.item.prototype.massupdate.php:432 msgid "As is" msgstr "როგორც არის" @@ -1111,7 +1112,7 @@ msgstr "" msgid "At %1$s:%2$s on day %3$s of every %4$s" msgstr "" -#: include/forms.inc.php:2098 +#: include/forms.inc.php:2346 msgid "At (hour:minute)" msgstr "" @@ -1194,13 +1195,13 @@ msgstr "აუდიტის ჟურნალი" msgid "Aug" msgstr "აგვ" -#: include/forms.inc.php:1967 include/func.inc.php:123 +#: include/forms.inc.php:2215 include/func.inc.php:123 #: include/func.inc.php:260 jsLoader.php:140 msgid "August" msgstr "აგვისტო" -#: app/views/administration.authentication.edit.php:127 -#: app/views/administration.authentication.edit.php:135 +#: app/views/administration.authentication.edit.php:137 +#: app/views/administration.authentication.edit.php:145 #: app/views/administration.mediatype.edit.php:89 include/menu.inc.php:265 #: include/views/configuration.httpconf.edit.php:283 #: include/views/configuration.httpconf.list.php:92 @@ -1220,37 +1221,37 @@ msgstr "" #: include/views/configuration.action.edit.php:948 #: include/views/configuration.action.edit.php:1735 #: include/views/configuration.action.edit.php:2193 -#: include/views/configuration.host.discovery.edit.php:464 -#: include/views/configuration.item.edit.php:611 -#: include/views/configuration.item.massupdate.php:296 -#: include/views/configuration.item.prototype.edit.php:543 +#: include/views/configuration.host.discovery.edit.php:447 +#: include/views/configuration.item.edit.php:598 +#: include/views/configuration.item.massupdate.php:282 +#: include/views/configuration.item.prototype.edit.php:524 #: include/views/configuration.item.prototype.massupdate.php:277 msgid "Authentication method" msgstr "ავთენტიფიკაციის მეთოდი" -#: app/controllers/CControllerAuthenticationUpdate.php:232 +#: app/controllers/CControllerAuthenticationUpdate.php:238 msgid "Authentication method changed" msgstr "" -#: include/views/configuration.host.discovery.edit.php:431 -#: include/views/configuration.item.edit.php:554 -#: include/views/configuration.item.massupdate.php:234 -#: include/views/configuration.item.prototype.edit.php:510 +#: include/views/configuration.host.discovery.edit.php:419 +#: include/views/configuration.item.edit.php:540 +#: include/views/configuration.item.massupdate.php:226 +#: include/views/configuration.item.prototype.edit.php:496 #: include/views/configuration.item.prototype.massupdate.php:222 #: include/views/js/configuration.discovery.edit.js.php:103 msgid "Authentication passphrase" msgstr "ავთენტიფიკაციის პაროლი" -#: include/views/configuration.host.discovery.edit.php:424 -#: include/views/configuration.item.edit.php:548 -#: include/views/configuration.item.massupdate.php:221 -#: include/views/configuration.item.prototype.edit.php:503 +#: include/views/configuration.host.discovery.edit.php:412 +#: include/views/configuration.item.edit.php:535 +#: include/views/configuration.item.massupdate.php:214 +#: include/views/configuration.item.prototype.edit.php:489 #: include/views/configuration.item.prototype.massupdate.php:210 #: include/views/js/configuration.discovery.edit.js.php:95 msgid "Authentication protocol" msgstr "ავთენტიფიკაციის ოქმი" -#: app/controllers/CControllerAuthenticationUpdate.php:231 +#: app/controllers/CControllerAuthenticationUpdate.php:237 msgid "Authentication settings updated" msgstr "" @@ -1348,7 +1349,7 @@ msgstr "" msgid "Background image" msgstr "ფონური გამოსახულება" -#: app/views/administration.authentication.edit.php:93 +#: app/views/administration.authentication.edit.php:98 msgid "Base DN" msgstr "საბაზო DN" @@ -1358,17 +1359,17 @@ msgid "Base colour" msgstr "" #: include/httptest.inc.php:28 -#: include/views/configuration.host.discovery.edit.php:285 -#: include/views/configuration.item.edit.php:326 -#: include/views/configuration.item.prototype.edit.php:314 +#: include/views/configuration.host.discovery.edit.php:276 +#: include/views/configuration.item.edit.php:319 +#: include/views/configuration.item.prototype.edit.php:304 msgid "Basic" msgstr "ჩვეულებრივი" -#: app/views/administration.authentication.edit.php:103 +#: app/views/administration.authentication.edit.php:110 msgid "Bind DN" msgstr "ბმის DN" -#: app/views/administration.authentication.edit.php:113 +#: app/views/administration.authentication.edit.php:121 msgid "Bind password" msgstr "ბმის პაროლი" @@ -1386,16 +1387,16 @@ msgid "Blue" msgstr "ლურჯი" #: app/views/popup.httpstep.php:142 -#: include/views/configuration.host.discovery.edit.php:261 -#: include/views/configuration.item.edit.php:293 -#: include/views/configuration.item.prototype.edit.php:281 +#: include/views/configuration.host.discovery.edit.php:254 +#: include/views/configuration.item.edit.php:289 +#: include/views/configuration.item.prototype.edit.php:274 msgid "Body" msgstr "" #: app/views/popup.httpstep.php:144 -#: include/views/configuration.host.discovery.edit.php:263 -#: include/views/configuration.item.edit.php:295 -#: include/views/configuration.item.prototype.edit.php:283 +#: include/views/configuration.host.discovery.edit.php:256 +#: include/views/configuration.item.edit.php:291 +#: include/views/configuration.item.prototype.edit.php:276 msgid "Body and headers" msgstr "" @@ -1404,7 +1405,7 @@ msgstr "" msgid "Bold line" msgstr "მუქი ხაზი" -#: include/items.inc.php:1757 +#: include/items.inc.php:1749 msgid "Boolean to decimal" msgstr "" @@ -1587,13 +1588,13 @@ msgstr "" msgid "Cannot add dependency from a host to a template." msgstr "ჰოსტიდან შაბლონში დამოკიდებულების დამატება ვერ მოხერხდა." -#: include/classes/api/services/CDiscoveryRule.php:847 +#: include/classes/api/services/CDiscoveryRule.php:864 #: include/triggers.inc.php:527 #, c-format msgid "Cannot add dependency from trigger \"%1$s:%2$s\" to non existing trigger \"%3$s:%4$s\"." msgstr "" -#: host_discovery.php:474 +#: host_discovery.php:553 msgid "Cannot add discovery rule" msgstr "" @@ -1750,25 +1751,25 @@ msgstr "" msgid "Cannot call method \"%1$s.%2$s\" without parameters." msgstr "" -#: httpconf.php:198 httpconf.php:504 items.php:999 items.php:1394 +#: httpconf.php:198 httpconf.php:504 items.php:999 items.php:1395 msgid "Cannot clear history" msgstr "ისტორიის გაწმენდა ვერ მოხერხდა" -#: include/classes/api/services/CDiscoveryRule.php:1588 +#: include/classes/api/services/CDiscoveryRule.php:1894 msgid "Cannot clone graph prototypes." msgstr "გრაფიკის პროტოტიპების კლონირება ვერ მოხერხდა." -#: include/classes/api/services/CDiscoveryRule.php:1636 +#: include/classes/api/services/CDiscoveryRule.php:1942 msgid "Cannot clone host prototypes." msgstr "ჰოსტის პროტოტიპების კლონირება ვერ მოხერხდა." -#: include/classes/api/services/CDiscoveryRule.php:1393 -#: include/classes/api/services/CDiscoveryRule.php:1449 -#: include/classes/api/services/CDiscoveryRule.php:1467 +#: include/classes/api/services/CDiscoveryRule.php:1699 +#: include/classes/api/services/CDiscoveryRule.php:1755 +#: include/classes/api/services/CDiscoveryRule.php:1773 msgid "Cannot clone item prototypes." msgstr "ელემენტის პროტოტიპების კლონირება ვერ მოხერხდა." -#: include/classes/api/services/CDiscoveryRule.php:760 +#: include/classes/api/services/CDiscoveryRule.php:777 msgid "Cannot clone trigger prototypes." msgstr "ტრიგერის პროტოტიპების კლონირება ვერ მოხერხდა." @@ -1794,7 +1795,7 @@ msgid "Cannot copy graph" msgid_plural "Cannot copy graphs" msgstr[0] "" -#: items.php:1350 +#: items.php:1351 msgid "Cannot copy item" msgid_plural "Cannot copy items" msgstr[0] "" @@ -1893,11 +1894,11 @@ msgstr "დამოკიდებულების წაშლა ვერ msgid "Cannot delete discovered application \"%1$s\"." msgstr "" -#: discoveryconf.php:186 host_discovery.php:274 +#: discoveryconf.php:186 host_discovery.php:278 msgid "Cannot delete discovery rule" msgstr "" -#: discoveryconf.php:228 host_discovery.php:517 +#: discoveryconf.php:228 host_discovery.php:596 msgid "Cannot delete discovery rules" msgstr "" @@ -1926,7 +1927,19 @@ msgstr[0] "" msgid "Cannot delete host" msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:533 +#: include/classes/api/services/CHost.php:1189 +#, c-format +msgid "Cannot delete host because maintenance \"%1$s\" must contain at least one host or host group." +msgid_plural "Cannot delete selected hosts because maintenance \"%1$s\" must contain at least one host or host group." +msgstr[0] "" + +#: include/classes/api/services/CHostGroup.php:1503 +#, c-format +msgid "Cannot delete host group because maintenance \"%1$s\" must contain at least one host or host group." +msgid_plural "Cannot delete selected host groups because maintenance \"%1$s\" must contain at least one host or host group." +msgstr[0] "" + +#: include/classes/api/services/CDiscoveryRule.php:548 msgid "Cannot delete host prototype." msgstr "" @@ -1958,7 +1971,7 @@ msgstr "ელემენტის პროტოტიპის წაშლ msgid "Cannot delete item prototypes" msgstr "ელემენტის პროტოტიპების წაშლა ვერ მოხერხდა" -#: items.php:1404 +#: items.php:1405 msgid "Cannot delete items" msgstr "ელემენტების წაშლა ვერ მოხერხდა" @@ -2035,15 +2048,15 @@ msgstr "" msgid "Cannot delete templated host prototype." msgstr "" -#: include/classes/api/services/CItemPrototype.php:876 +#: include/classes/api/services/CItemPrototype.php:890 msgid "Cannot delete templated item prototype." msgstr "" -#: include/classes/api/services/CItem.php:706 +#: include/classes/api/services/CItem.php:719 msgid "Cannot delete templated item." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:484 +#: include/classes/api/services/CDiscoveryRule.php:499 msgid "Cannot delete templated items." msgstr "" @@ -2101,7 +2114,7 @@ msgid "Cannot disable correlation" msgid_plural "Cannot disable correlations" msgstr[0] "" -#: discoveryconf.php:213 host_discovery.php:507 +#: discoveryconf.php:213 host_discovery.php:586 msgid "Cannot disable discovery rule" msgid_plural "Cannot disable discovery rules" msgstr[0] "" @@ -2112,7 +2125,7 @@ msgid "Cannot disable host" msgid_plural "Cannot disable hosts" msgstr[0] "" -#: applications.php:175 items.php:1310 +#: applications.php:175 items.php:1311 msgid "Cannot disable item" msgid_plural "Cannot disable items" msgstr[0] "" @@ -2155,7 +2168,7 @@ msgid "Cannot enable correlation" msgid_plural "Cannot enable correlations" msgstr[0] "" -#: discoveryconf.php:212 host_discovery.php:506 +#: discoveryconf.php:212 host_discovery.php:585 msgid "Cannot enable discovery rule" msgid_plural "Cannot enable discovery rules" msgstr[0] "" @@ -2166,7 +2179,7 @@ msgid "Cannot enable host" msgid_plural "Cannot enable hosts" msgstr[0] "" -#: applications.php:174 items.php:1309 +#: applications.php:174 items.php:1310 msgid "Cannot enable item" msgid_plural "Cannot enable items" msgstr[0] "" @@ -2229,13 +2242,13 @@ msgstr "" msgid "Cannot find host \"%1$s\" used in screen \"%2$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1086 +#: include/classes/import/CConfigurationImport.php:1094 #, c-format msgid "Cannot find host group \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1256 -#: include/classes/api/services/CDiscoveryRule.php:1420 +#: include/classes/api/services/CDiscoveryRule.php:1562 +#: include/classes/api/services/CDiscoveryRule.php:1726 #: include/classes/api/services/CItemGeneral.php:116 include/items.inc.php:506 #: include/items.inc.php:653 #, c-format @@ -2252,32 +2265,32 @@ msgstr "" msgid "Cannot find icon map \"%1$s\" used in map \"%2$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1470 +#: include/classes/import/CConfigurationImport.php:1478 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph \"%3$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1239 +#: include/classes/import/CConfigurationImport.php:1247 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MAX value for graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1454 +#: include/classes/import/CConfigurationImport.php:1462 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph \"%3$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1219 +#: include/classes/import/CConfigurationImport.php:1227 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used as the Y axis MIN value for graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1489 +#: include/classes/import/CConfigurationImport.php:1497 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph \"%3$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1259 +#: include/classes/import/CConfigurationImport.php:1267 #, c-format msgid "Cannot find item \"%1$s\" on \"%2$s\" used in graph prototype \"%3$s\" of discovery rule \"%4$s\" on \"%5$s\"." msgstr "" @@ -2306,7 +2319,7 @@ msgstr "" msgid "Cannot find screen \"%1$s\" used in screen \"%2$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1109 +#: include/classes/import/CConfigurationImport.php:1117 #, c-format msgid "Cannot find template \"%1$s\" for host prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "" @@ -2322,7 +2335,7 @@ msgstr "" msgid "Cannot find value map \"%1$s\" used for item \"%2$s\" on \"%3$s\"." msgstr "" -#: include/classes/import/CConfigurationImport.php:1014 +#: include/classes/import/CConfigurationImport.php:1022 #, c-format msgid "Cannot find value map \"%1$s\" used for item prototype \"%2$s\" of discovery rule \"%3$s\" on \"%4$s\"." msgstr "" @@ -2335,7 +2348,7 @@ msgstr "" msgid "Cannot format tree." msgstr "" -#: include/classes/api/services/CTemplate.php:805 +#: include/classes/api/services/CTemplate.php:803 msgid "Cannot have empty visible template name." msgstr "" @@ -2369,8 +2382,8 @@ msgstr "" msgid "Cannot link template" msgstr "" -#: include/classes/api/services/CTemplate.php:892 -#: include/classes/api/services/CTemplate.php:906 +#: include/classes/api/services/CTemplate.php:890 +#: include/classes/api/services/CTemplate.php:904 msgid "Cannot link template." msgstr "" @@ -2382,7 +2395,7 @@ msgstr "" msgid "Cannot mass update host name." msgstr "" -#: include/classes/api/services/CTemplate.php:1030 +#: include/classes/api/services/CTemplate.php:1028 msgid "Cannot mass update template name." msgstr "" @@ -2390,7 +2403,7 @@ msgstr "" msgid "Cannot mass update visible host name." msgstr "" -#: include/classes/api/services/CTemplate.php:995 +#: include/classes/api/services/CTemplate.php:993 msgid "Cannot mass update visible template name." msgstr "" @@ -2418,8 +2431,8 @@ msgstr "" msgid "Cannot process applications from different hosts or templates." msgstr "" -#: include/classes/api/services/CItemGeneral.php:2235 -#: include/classes/api/services/CItemGeneral.php:2262 +#: include/classes/api/services/CItemGeneral.php:2198 +#: include/classes/api/services/CItemGeneral.php:2225 msgid "Cannot read JSON." msgstr "" @@ -2428,8 +2441,8 @@ msgstr "" msgid "Cannot read JSON: %1$s." msgstr "" -#: include/classes/api/services/CItemGeneral.php:2222 -#: include/classes/api/services/CItemGeneral.php:2226 +#: include/classes/api/services/CItemGeneral.php:2185 +#: include/classes/api/services/CItemGeneral.php:2189 #: include/classes/import/readers/CXmlImportReader.php:35 #: include/classes/import/readers/CXmlImportReader.php:46 #, c-format @@ -2460,7 +2473,7 @@ msgstr "" msgid "Cannot send command, check connection with Zabbix server \"%1$s\"." msgstr "" -#: host_discovery.php:284 host_discovery.php:529 items.php:967 items.php:1416 +#: host_discovery.php:288 host_discovery.php:608 items.php:967 items.php:1417 msgid "Cannot send request" msgstr "" @@ -2509,7 +2522,7 @@ msgstr "" msgid "Cannot set \"%1$s\" for trigger prototype \"%2$s\"." msgstr "" -#: include/classes/api/services/CItemPrototype.php:324 +#: include/classes/api/services/CItemPrototype.php:339 #, c-format msgid "Cannot set \"templateid\" field for application prototype in item prototype \"%1$s\"." msgstr "" @@ -2520,8 +2533,8 @@ msgid "Cannot set \"templateid\" for screen \"%1$s\"." msgstr "" #: include/classes/api/services/CHost.php:881 -#: include/classes/api/services/CHost.php:1705 -#: include/classes/api/services/CHost.php:1849 +#: include/classes/api/services/CHost.php:1741 +#: include/classes/api/services/CHost.php:1885 msgid "Cannot set inventory fields for disabled inventory." msgstr "" @@ -2538,15 +2551,15 @@ msgstr "" msgid "Cannot unblock users" msgstr "" -#: include/classes/api/services/CHostGeneral.php:563 +#: include/classes/api/services/CHostGeneral.php:559 msgid "Cannot unlink and clear Web scenarios." msgstr "" -#: include/classes/api/services/CHostGeneral.php:624 +#: include/classes/api/services/CHostGeneral.php:620 msgid "Cannot unlink and clear applications." msgstr "" -#: include/classes/api/services/CHostGeneral.php:367 +#: include/classes/api/services/CHostGeneral.php:363 msgid "Cannot unlink and clear discovery rules" msgstr "" @@ -2554,12 +2567,12 @@ msgstr "" msgid "Cannot unlink template" msgstr "" -#: include/classes/api/services/CTemplate.php:857 -#: include/classes/api/services/CTemplate.php:880 +#: include/classes/api/services/CTemplate.php:855 +#: include/classes/api/services/CTemplate.php:878 msgid "Cannot unlink template." msgstr "" -#: include/classes/api/services/CHostGeneral.php:273 +#: include/classes/api/services/CHostGeneral.php:269 #, c-format msgid "Cannot unlink trigger \"%s\", it has items from template that is left linked to host." msgstr "" @@ -2605,7 +2618,7 @@ msgstr "" msgid "Cannot update \"%1$s\" for trigger prototype \"%2$s\"." msgstr "" -#: include/classes/api/services/CHost.php:1828 +#: include/classes/api/services/CHost.php:1864 #, c-format msgid "Cannot update \"%2$s\" for a discovered host \"%1$s\"." msgstr "" @@ -2641,7 +2654,7 @@ msgstr "" msgid "Cannot update a discovered graph." msgstr "" -#: include/classes/api/services/CHostGroup.php:780 +#: include/classes/api/services/CHostGroup.php:797 msgid "Cannot update a discovered host group." msgstr "" @@ -2658,7 +2671,7 @@ msgstr "" msgid "Cannot update application" msgstr "" -#: app/controllers/CControllerAuthenticationUpdate.php:236 +#: app/controllers/CControllerAuthenticationUpdate.php:242 msgid "Cannot update authentication" msgstr "" @@ -2685,7 +2698,7 @@ msgstr "" msgid "Cannot update discovered application \"%1$s\"." msgstr "" -#: discoveryconf.php:155 host_discovery.php:477 +#: discoveryconf.php:155 host_discovery.php:556 msgid "Cannot update discovery rule" msgstr "" @@ -2711,9 +2724,9 @@ msgstr "" msgid "Cannot update group" msgstr "" -#: include/classes/api/services/CHostGroup.php:986 -#: include/classes/api/services/CHostGroup.php:1090 -#: include/classes/api/services/CHostGroup.php:1226 +#: include/classes/api/services/CHostGroup.php:1003 +#: include/classes/api/services/CHostGroup.php:1107 +#: include/classes/api/services/CHostGroup.php:1243 #, c-format msgid "Cannot update groups for discovered host \"%1$s\"." msgstr "" @@ -2757,11 +2770,11 @@ msgid "Cannot update item prototype" msgid_plural "Cannot update item prototypes" msgstr[0] "" -#: disc_prototypes.php:1103 +#: disc_prototypes.php:1116 msgid "Cannot update item prototypes" msgstr "" -#: items.php:1286 +#: items.php:1287 msgid "Cannot update items" msgstr "" @@ -2829,7 +2842,7 @@ msgid "Cannot update templated applications." msgstr "" #: include/classes/api/services/CTemplate.php:754 -#: include/classes/api/services/CTemplate.php:1090 +#: include/classes/api/services/CTemplate.php:1088 #, c-format msgid "Cannot update templates on discovered host \"%1$s\"." msgstr "" @@ -2882,8 +2895,8 @@ msgstr "" msgid "Case sensitive" msgstr "" -#: app/views/administration.authentication.edit.php:52 -#: app/views/administration.authentication.edit.php:108 +#: app/views/administration.authentication.edit.php:53 +#: app/views/administration.authentication.edit.php:115 msgid "Case sensitive login" msgstr "" @@ -2915,7 +2928,8 @@ msgstr "" msgid "Certificate" msgstr "" -#: include/items.inc.php:1748 latest.php:429 latest.php:442 +#: include/items.inc.php:1740 include/items.inc.php:1744 latest.php:429 +#: latest.php:442 msgctxt "noun" msgid "Change" msgstr "" @@ -2929,13 +2943,13 @@ msgctxt "verb" msgid "Change" msgstr "" -#: app/views/administration.authentication.edit.php:70 +#: app/views/administration.authentication.edit.php:72 #: app/views/administration.mediatype.edit.php:140 #: include/views/administration.users.edit.php:128 msgid "Change password" msgstr "" -#: include/items.inc.php:1751 +#: include/items.inc.php:1745 msgid "Change per second" msgstr "" @@ -2944,9 +2958,9 @@ msgid "Change severity" msgstr "" #: include/forms.inc.php:353 include/items.inc.php:131 -#: include/views/configuration.item.edit.php:678 -#: include/views/configuration.item.massupdate.php:279 -#: include/views/configuration.item.prototype.edit.php:607 +#: include/views/configuration.item.edit.php:665 +#: include/views/configuration.item.massupdate.php:267 +#: include/views/configuration.item.prototype.edit.php:594 #: include/views/configuration.item.prototype.massupdate.php:262 msgid "Character" msgstr "" @@ -2977,21 +2991,21 @@ msgstr "" msgid "Check expression part starting from \"%1$s\"." msgstr "" -#: include/items.inc.php:1768 +#: include/items.inc.php:1773 msgid "Check for error in JSON" msgstr "" -#: include/items.inc.php:1769 +#: include/items.inc.php:1777 msgid "Check for error in XML" msgstr "" -#: include/items.inc.php:1770 +#: include/items.inc.php:1781 msgid "Check for error using regular expression" msgstr "" -#: include/views/configuration.host.discovery.edit.php:698 +#: include/views/configuration.host.discovery.edit.php:760 #: include/views/configuration.host.discovery.list.php:157 -#: include/views/configuration.item.edit.php:1172 +#: include/views/configuration.item.edit.php:934 #: include/views/configuration.item.list.php:286 msgid "Check now" msgstr "" @@ -3106,7 +3120,7 @@ msgid "Clear history" msgstr "" #: include/views/configuration.httpconf.edit.php:297 -#: include/views/configuration.item.edit.php:1182 +#: include/views/configuration.item.edit.php:944 msgid "Clear history and trends" msgstr "" @@ -3130,13 +3144,13 @@ msgstr "" #: include/views/configuration.correlation.edit.php:277 #: include/views/configuration.discovery.edit.php:110 #: include/views/configuration.graph.edit.php:465 -#: include/views/configuration.host.discovery.edit.php:695 +#: include/views/configuration.host.discovery.edit.php:757 #: include/views/configuration.host.edit.php:812 #: include/views/configuration.hostgroups.edit.php:58 #: include/views/configuration.host.prototype.edit.php:436 #: include/views/configuration.httpconf.edit.php:290 -#: include/views/configuration.item.edit.php:1169 -#: include/views/configuration.item.prototype.edit.php:1004 +#: include/views/configuration.item.edit.php:931 +#: include/views/configuration.item.prototype.edit.php:769 #: include/views/configuration.maintenance.edit.php:287 #: include/views/configuration.template.edit.php:445 #: include/views/configuration.trigger.prototype.edit.php:636 @@ -3270,7 +3284,7 @@ msgstr "" msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for correlation \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1081 +#: include/classes/api/services/CDiscoveryRule.php:1245 #, c-format msgid "Condition \"%2$s\" is not used in formula \"%3$s\" for discovery rule \"%1$s\"." msgstr "" @@ -3285,7 +3299,7 @@ msgstr "" msgid "Condition \"%2$s\" used in formula \"%3$s\" for correlation \"%1$s\" is not defined." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1080 +#: include/classes/api/services/CDiscoveryRule.php:1244 #, c-format msgid "Condition \"%2$s\" used in formula \"%3$s\" for discovery rule \"%1$s\" is not defined." msgstr "" @@ -3337,7 +3351,7 @@ msgstr "" msgid "Configuration of applications" msgstr "" -#: app/controllers/CControllerAuthenticationEdit.php:127 +#: app/controllers/CControllerAuthenticationEdit.php:120 msgid "Configuration of authentication" msgstr "" @@ -3645,10 +3659,10 @@ msgstr "" msgid "Content menu" msgstr "" -#: include/views/configuration.host.discovery.edit.php:400 -#: include/views/configuration.item.edit.php:495 -#: include/views/configuration.item.massupdate.php:193 -#: include/views/configuration.item.prototype.edit.php:479 +#: include/views/configuration.host.discovery.edit.php:385 +#: include/views/configuration.item.edit.php:481 +#: include/views/configuration.item.massupdate.php:189 +#: include/views/configuration.item.prototype.edit.php:464 #: include/views/configuration.item.prototype.massupdate.php:185 #: include/views/js/configuration.discovery.edit.js.php:72 msgid "Context name" @@ -3658,8 +3672,8 @@ msgstr "" msgid "Contract number" msgstr "" -#: include/views/configuration.item.edit.php:303 -#: include/views/configuration.item.prototype.edit.php:291 +#: include/views/configuration.item.edit.php:298 +#: include/views/configuration.item.prototype.edit.php:283 msgid "Convert to JSON" msgstr "" @@ -3796,10 +3810,10 @@ msgstr "" #: include/views/configuration.host.prototype.edit.php:164 #: include/views/configuration.host.prototype.list.php:55 #: include/views/configuration.host.prototype.list.php:154 -#: include/views/configuration.item.prototype.edit.php:761 +#: include/views/configuration.item.prototype.edit.php:747 #: include/views/configuration.item.prototype.list.php:59 #: include/views/configuration.item.prototype.list.php:170 -#: include/views/configuration.item.prototype.massupdate.php:518 +#: include/views/configuration.item.prototype.massupdate.php:418 #: include/views/configuration.trigger.prototype.edit.php:539 #: include/views/configuration.trigger.prototype.list.php:53 #: include/views/configuration.trigger.prototype.list.php:158 @@ -3965,7 +3979,7 @@ msgstr "" #: include/views/configuration.action.edit.php:114 #: include/views/configuration.correlation.edit.php:96 -#: include/views/configuration.host.discovery.edit.php:600 +#: include/views/configuration.host.discovery.edit.php:588 msgid "Custom expression" msgstr "" @@ -3973,11 +3987,11 @@ msgstr "" msgid "Custom graphs" msgstr "" -#: include/views/configuration.host.discovery.edit.php:559 -#: include/views/configuration.item.edit.php:754 -#: include/views/configuration.item.massupdate.php:502 -#: include/views/configuration.item.prototype.edit.php:669 -#: include/views/configuration.item.prototype.massupdate.php:480 +#: include/views/configuration.host.discovery.edit.php:548 +#: include/views/configuration.item.edit.php:741 +#: include/views/configuration.item.massupdate.php:384 +#: include/views/configuration.item.prototype.edit.php:656 +#: include/views/configuration.item.prototype.massupdate.php:380 msgid "Custom intervals" msgstr "" @@ -3991,15 +4005,12 @@ msgstr "" msgid "Custom label for map \"%2$s\" elements of type \"%1$s\" may not be empty." msgstr "" -#: include/items.inc.php:1744 +#: include/items.inc.php:1737 msgid "Custom multiplier" msgstr "" -#: include/views/configuration.item.edit.php:938 -#: include/views/configuration.item.edit.php:1099 -#: include/views/configuration.item.prototype.edit.php:771 -#: include/views/configuration.item.prototype.edit.php:932 -#: include/views/js/common.item.edit.js.php:75 +#: include/forms.inc.php:1399 include/forms.inc.php:1563 +#: include/views/js/item.preprocessing.js.php:44 msgid "Custom on fail" msgstr "" @@ -4034,11 +4045,11 @@ msgctxt "XML date format" msgid "DD.MM.YY" msgstr "" -#: include/views/configuration.host.discovery.edit.php:438 -#: include/views/configuration.item.edit.php:564 -#: include/views/configuration.item.edit.php:571 -#: include/views/configuration.item.massupdate.php:247 -#: include/views/configuration.item.prototype.edit.php:517 +#: include/views/configuration.host.discovery.edit.php:426 +#: include/views/configuration.item.edit.php:550 +#: include/views/configuration.item.edit.php:557 +#: include/views/configuration.item.massupdate.php:238 +#: include/views/configuration.item.prototype.edit.php:503 #: include/views/configuration.item.prototype.massupdate.php:234 #: include/views/js/configuration.discovery.edit.js.php:112 msgid "DES" @@ -4064,7 +4075,7 @@ msgstr "" msgid "DNS name" msgstr "" -#: app/views/report.services.php:34 include/forms.inc.php:1875 +#: app/views/report.services.php:34 include/forms.inc.php:2123 #: include/maintenances.inc.php:33 report4.php:107 msgid "Daily" msgstr "" @@ -4201,7 +4212,7 @@ msgstr "" msgid "Database user" msgstr "" -#: include/forms.inc.php:2004 include/forms.inc.php:2089 maintenance.php:51 +#: include/forms.inc.php:2252 include/forms.inc.php:2337 maintenance.php:51 msgid "Date" msgstr "" @@ -4229,16 +4240,16 @@ msgstr "" msgid "Day before yesterday" msgstr "" -#: include/forms.inc.php:2006 include/forms.inc.php:2067 +#: include/forms.inc.php:2254 include/forms.inc.php:2315 msgid "Day of month" msgstr "" -#: include/forms.inc.php:1908 include/forms.inc.php:2007 -#: include/forms.inc.php:2015 +#: include/forms.inc.php:2156 include/forms.inc.php:2255 +#: include/forms.inc.php:2263 msgid "Day of week" msgstr "" -#: include/forms.inc.php:2116 +#: include/forms.inc.php:2364 msgid "Days" msgstr "" @@ -4260,7 +4271,7 @@ msgstr "" msgid "Dec" msgstr "" -#: include/forms.inc.php:1999 include/func.inc.php:127 +#: include/forms.inc.php:2247 include/func.inc.php:127 #: include/func.inc.php:264 jsLoader.php:144 msgid "December" msgstr "" @@ -4290,7 +4301,7 @@ msgstr "" msgid "Default host inventory mode" msgstr "" -#: app/views/administration.authentication.edit.php:41 +#: app/views/administration.authentication.edit.php:42 msgid "Default login form" msgstr "" @@ -4327,8 +4338,8 @@ msgstr "" msgid "Default theme \"%1$s\"." msgstr "" -#: include/views/configuration.item.massupdate.php:448 -#: include/views/configuration.item.prototype.massupdate.php:426 +#: include/views/configuration.item.massupdate.php:330 +#: include/views/configuration.item.prototype.massupdate.php:326 #: include/views/monitoring.slideconf.edit.php:114 #: include/views/monitoring.slideconf.list.php:64 msgid "Delay" @@ -4411,7 +4422,7 @@ msgid "Delete dashboard?" msgstr "" #: include/views/configuration.discovery.edit.php:111 -#: include/views/configuration.host.discovery.edit.php:705 +#: include/views/configuration.host.discovery.edit.php:767 msgid "Delete discovery rule?" msgstr "" @@ -4442,11 +4453,11 @@ msgstr "" msgid "Delete icon map?" msgstr "" -#: include/views/configuration.item.prototype.edit.php:1005 +#: include/views/configuration.item.prototype.edit.php:770 msgid "Delete item prototype?" msgstr "" -#: include/views/configuration.item.edit.php:1187 +#: include/views/configuration.item.edit.php:949 msgid "Delete item?" msgstr "" @@ -4663,7 +4674,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: include/classes/api/services/CHost.php:1305 +#: include/classes/api/services/CHost.php:1341 #, c-format msgid "Deleted: Host \"%1$s\"." msgstr "" @@ -4722,13 +4733,13 @@ msgstr "" #: include/classes/screens/CScreenEvents.php:32 #: include/views/administration.auditlogs.list.php:76 #: include/views/configuration.correlation.edit.php:205 -#: include/views/configuration.host.discovery.edit.php:580 +#: include/views/configuration.host.discovery.edit.php:569 #: include/views/configuration.host.edit.php:264 #: include/views/configuration.host.massupdate.php:161 -#: include/views/configuration.item.edit.php:919 -#: include/views/configuration.item.massupdate.php:685 -#: include/views/configuration.item.prototype.edit.php:754 -#: include/views/configuration.item.prototype.massupdate.php:679 +#: include/views/configuration.item.edit.php:905 +#: include/views/configuration.item.massupdate.php:567 +#: include/views/configuration.item.prototype.edit.php:743 +#: include/views/configuration.item.prototype.massupdate.php:579 #: include/views/configuration.maintenance.edit.php:67 #: include/views/configuration.maintenance.list.php:75 #: include/views/configuration.template.edit.php:108 @@ -4899,17 +4910,15 @@ msgstr "" msgid "Disaster" msgstr "" -#: include/items.inc.php:1776 +#: include/items.inc.php:1785 msgid "Discard unchanged" msgstr "" -#: include/items.inc.php:1777 +#: include/items.inc.php:1789 msgid "Discard unchanged with heartbeat" msgstr "" -#: include/views/configuration.item.edit.php:1077 -#: include/views/configuration.item.prototype.edit.php:910 -#: include/views/js/common.item.edit.js.php:80 +#: include/forms.inc.php:1541 include/views/js/item.preprocessing.js.php:49 msgid "Discard value" msgstr "" @@ -4974,17 +4983,17 @@ msgstr "" #: app/views/monitoring.discovery.view.php:36 #: app/views/monitoring.widget.discovery.view.php:28 #: include/actions.inc.php:52 include/audit.inc.php:46 -#: include/forms.inc.php:1116 +#: include/forms.inc.php:1113 #: include/views/configuration.discovery.edit.php:102 msgid "Discovery rule" msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:35 +#: include/classes/api/services/CDiscoveryRule.php:46 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:36 +#: include/classes/api/services/CDiscoveryRule.php:47 #, c-format msgid "Discovery rule \"%1$s\" already exists on \"%2$s\"." msgstr "" @@ -5003,25 +5012,25 @@ msgstr "" msgid "Discovery rule \"%1$s\" is used in \"%2$s\" action." msgstr "" -#: discoveryconf.php:161 host_discovery.php:474 +#: discoveryconf.php:161 host_discovery.php:553 msgid "Discovery rule created" msgstr "" -#: discoveryconf.php:186 host_discovery.php:274 +#: discoveryconf.php:186 host_discovery.php:278 msgid "Discovery rule deleted" msgstr "" -#: discoveryconf.php:210 host_discovery.php:504 +#: discoveryconf.php:210 host_discovery.php:583 msgid "Discovery rule disabled" msgid_plural "Discovery rules disabled" msgstr[0] "" -#: discoveryconf.php:209 host_discovery.php:503 +#: discoveryconf.php:209 host_discovery.php:582 msgid "Discovery rule enabled" msgid_plural "Discovery rules enabled" msgstr[0] "" -#: discoveryconf.php:154 host_discovery.php:477 +#: discoveryconf.php:154 host_discovery.php:556 msgid "Discovery rule updated" msgstr "" @@ -5036,7 +5045,7 @@ msgstr "" msgid "Discovery rules" msgstr "" -#: discoveryconf.php:228 host_discovery.php:517 +#: discoveryconf.php:228 host_discovery.php:596 msgid "Discovery rules deleted" msgstr "" @@ -5101,7 +5110,7 @@ msgstr "" msgid "Do you wish to replace the conditional expression?" msgstr "" -#: include/items.inc.php:1767 +#: include/items.inc.php:1769 msgid "Does not match regular expression" msgstr "" @@ -5176,7 +5185,7 @@ msgstr "" msgid "Duplicate \"description\" value \"%1$s\" for media type." msgstr "" -#: include/classes/api/services/CItemPrototype.php:334 +#: include/classes/api/services/CItemPrototype.php:349 #, c-format msgid "Duplicate \"name\" value \"%1$s\" for application prototype in item prototype \"%2$s\"." msgstr "" @@ -5203,14 +5212,14 @@ msgstr "" msgid "Duplicate dependencies in trigger prototype \"%1$s\"." msgstr "" -#: include/classes/api/services/CHost.php:1641 -#: include/classes/api/services/CHost.php:1879 +#: include/classes/api/services/CHost.php:1677 +#: include/classes/api/services/CHost.php:1915 #, c-format msgid "Duplicate host. Host with the same host name \"%s\" already exists in data." msgstr "" -#: include/classes/api/services/CHost.php:1648 -#: include/classes/api/services/CHost.php:1899 +#: include/classes/api/services/CHost.php:1684 +#: include/classes/api/services/CHost.php:1935 #, c-format msgid "Duplicate host. Host with the same visible name \"%s\" already exists in data." msgstr "" @@ -5327,8 +5336,8 @@ msgstr "" msgid "Elasticsearch error: %1$s." msgstr "" -#: include/classes/api/managers/CHistoryManager.php:652 -#: include/classes/api/managers/CHistoryManager.php:661 +#: include/classes/api/managers/CHistoryManager.php:713 +#: include/classes/api/managers/CHistoryManager.php:722 #, c-format msgid "Elasticsearch url is not set for type: %1$s." msgstr "" @@ -5383,7 +5392,7 @@ msgstr "" msgid "Empty action condition." msgstr "" -#: include/classes/api/services/CItemPrototype.php:318 +#: include/classes/api/services/CItemPrototype.php:333 #, c-format msgid "Empty application prototype name in item prototype \"%1$s\"." msgstr "" @@ -5401,19 +5410,19 @@ msgstr "" msgid "Empty filter condition formula ID for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1108 +#: include/classes/api/services/CDiscoveryRule.php:1272 #, c-format msgid "Empty filter condition formula ID for discovery rule \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1100 +#: include/classes/api/services/CDiscoveryRule.php:1264 #, c-format msgid "Empty filter condition macro for discovery rule \"%1$s\"." msgstr "" #: include/classes/api/services/CCorrelation.php:516 #: include/classes/api/services/CCorrelation.php:693 -#: include/classes/api/services/CDiscoveryRule.php:465 +#: include/classes/api/services/CDiscoveryRule.php:480 #: include/classes/api/services/CDRule.php:187 #: include/classes/api/services/CDRule.php:313 #: include/classes/api/services/CHostInterface.php:383 @@ -5490,7 +5499,7 @@ msgstr "" msgid "Enable HTTP authentication" msgstr "" -#: app/views/administration.authentication.edit.php:77 +#: app/views/administration.authentication.edit.php:79 msgid "Enable LDAP authentication" msgstr "" @@ -5576,11 +5585,11 @@ msgstr "" msgid "Enable selected web scenarios?" msgstr "" -#: include/views/configuration.host.discovery.edit.php:571 -#: include/views/configuration.item.edit.php:843 -#: include/views/configuration.item.massupdate.php:568 -#: include/views/configuration.item.prototype.edit.php:716 -#: include/views/configuration.item.prototype.massupdate.php:549 +#: include/views/configuration.host.discovery.edit.php:560 +#: include/views/configuration.item.edit.php:828 +#: include/views/configuration.item.massupdate.php:450 +#: include/views/configuration.item.prototype.edit.php:705 +#: include/views/configuration.item.prototype.massupdate.php:449 msgid "Enable trapping" msgstr "" @@ -5610,12 +5619,12 @@ msgstr "" #: include/views/configuration.correlation.list.php:104 #: include/views/configuration.discovery.edit.php:99 #: include/views/configuration.discovery.list.php:44 -#: include/views/configuration.host.discovery.edit.php:586 +#: include/views/configuration.host.discovery.edit.php:572 #: include/views/configuration.host.edit.php:280 #: include/views/configuration.host.list.php:186 #: include/views/configuration.host.massupdate.php:185 #: include/views/configuration.httpconf.edit.php:143 -#: include/views/configuration.item.edit.php:928 +#: include/views/configuration.item.edit.php:911 #: include/views/configuration.triggers.edit.php:575 msgid "Enabled" msgstr "" @@ -5648,7 +5657,7 @@ msgstr "" msgid "Equals" msgstr "" -#: include/items.inc.php:35 include/views/js/common.item.edit.js.php:730 +#: include/items.inc.php:35 include/views/js/common.item.edit.js.php:321 #: include/views/js/configuration.httpconf.edit.js.php:577 #: include/views/js/configuration.httpconf.edit.js.php:652 msgid "Error" @@ -5727,11 +5736,11 @@ msgstr[0] "" msgid "Events and alerts" msgstr "" -#: include/forms.inc.php:1889 +#: include/forms.inc.php:2137 msgid "Every day(s)" msgstr "" -#: include/forms.inc.php:1902 +#: include/forms.inc.php:2150 msgid "Every week(s)" msgstr "" @@ -5775,9 +5784,9 @@ msgid "Executed" msgstr "" #: include/items.inc.php:1678 -#: include/views/configuration.host.discovery.edit.php:494 -#: include/views/configuration.item.edit.php:641 -#: include/views/configuration.item.prototype.edit.php:573 +#: include/views/configuration.host.discovery.edit.php:483 +#: include/views/configuration.item.edit.php:628 +#: include/views/configuration.item.prototype.edit.php:560 msgid "Executed script" msgstr "" @@ -5864,8 +5873,8 @@ msgstr "" msgid "Expression constructor" msgstr "" -#: include/forms.inc.php:1647 include/forms.inc.php:1652 -#: include/forms.inc.php:1660 +#: include/forms.inc.php:1895 include/forms.inc.php:1900 +#: include/forms.inc.php:1908 msgid "Expression syntax error." msgstr "" @@ -5918,7 +5927,7 @@ msgstr "" msgid "Failed to create dashboard" msgstr "" -#: include/views/js/common.item.edit.js.php:732 +#: include/views/js/common.item.edit.js.php:323 #: include/views/js/configuration.httpconf.edit.js.php:654 msgid "Failed to parse URL." msgstr "" @@ -5955,7 +5964,7 @@ msgstr "" msgid "Feb" msgstr "" -#: include/forms.inc.php:1964 include/func.inc.php:117 +#: include/forms.inc.php:2212 include/func.inc.php:117 #: include/func.inc.php:254 jsLoader.php:134 msgid "February" msgstr "" @@ -5975,9 +5984,9 @@ msgstr "" #: include/classes/api/services/CDRule.php:318 #: include/classes/api/services/CDRule.php:493 #: include/classes/api/services/CDRule.php:503 -#: include/classes/api/services/CHostGroup.php:897 +#: include/classes/api/services/CHostGroup.php:914 #: include/classes/api/services/CHost.php:743 -#: include/classes/api/services/CTemplate.php:784 +#: include/classes/api/services/CTemplate.php:782 #: include/classes/api/services/CTriggerGeneral.php:236 #: include/classes/validators/CNewValidator.php:255 #: include/validate.inc.php:300 @@ -6114,8 +6123,8 @@ msgstr "" msgid "Filter" msgstr "" -#: include/views/configuration.host.discovery.edit.php:679 -#: include/views/configuration.host.discovery.edit.php:688 +#: include/views/configuration.host.discovery.edit.php:667 +#: include/views/configuration.host.discovery.edit.php:749 msgid "Filters" msgstr "" @@ -6161,21 +6170,21 @@ msgstr "" msgid "Fixed" msgstr "" -#: include/views/configuration.host.discovery.edit.php:523 -#: include/views/configuration.item.edit.php:707 -#: include/views/configuration.item.edit.php:714 -#: include/views/configuration.item.massupdate.php:465 -#: include/views/configuration.item.prototype.edit.php:634 -#: include/views/configuration.item.prototype.massupdate.php:443 +#: include/views/configuration.host.discovery.edit.php:511 +#: include/views/configuration.item.edit.php:694 +#: include/views/configuration.item.edit.php:701 +#: include/views/configuration.item.massupdate.php:347 +#: include/views/configuration.item.prototype.edit.php:621 +#: include/views/configuration.item.prototype.massupdate.php:343 #: include/views/js/common.item.edit.js.php:7 -#: include/views/js/configuration.item.massupdate.js.php:7 +#: include/views/js/configuration.item.massupdate.js.php:11 msgid "Flexible" msgstr "" #: app/views/popup.httpstep.php:135 -#: include/views/configuration.host.discovery.edit.php:250 -#: include/views/configuration.item.edit.php:282 -#: include/views/configuration.item.prototype.edit.php:270 +#: include/views/configuration.host.discovery.edit.php:244 +#: include/views/configuration.item.edit.php:279 +#: include/views/configuration.item.prototype.edit.php:264 msgid "Follow redirects" msgstr "" @@ -6201,8 +6210,8 @@ msgstr "" msgid "Form data" msgstr "" -#: include/items.inc.php:1682 include/views/configuration.item.edit.php:657 -#: include/views/configuration.item.prototype.edit.php:587 +#: include/items.inc.php:1682 include/views/configuration.item.edit.php:644 +#: include/views/configuration.item.prototype.edit.php:574 msgid "Formula" msgstr "" @@ -6214,7 +6223,7 @@ msgstr "" msgid "Fri" msgstr "" -#: include/forms.inc.php:1932 include/forms.inc.php:2047 +#: include/forms.inc.php:2180 include/forms.inc.php:2295 #: include/func.inc.php:139 include/func.inc.php:229 jsLoader.php:149 msgid "Friday" msgstr "" @@ -6590,12 +6599,12 @@ msgstr "" msgid "Group" msgstr "" -#: include/classes/api/services/CHostGroup.php:551 +#: include/classes/api/services/CHostGroup.php:715 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used by a host prototype." msgstr "" -#: include/classes/api/services/CHostGroup.php:600 +#: include/classes/api/services/CHostGroup.php:764 #, c-format msgid "Group \"%1$s\" cannot be deleted, because it is used in a correlation condition." msgstr "" @@ -6683,26 +6692,26 @@ msgstr "" msgid "HTTP agent" msgstr "" -#: include/views/configuration.host.discovery.edit.php:280 +#: include/views/configuration.host.discovery.edit.php:271 #: include/views/configuration.httpconf.edit.php:154 -#: include/views/configuration.item.edit.php:321 -#: include/views/configuration.item.prototype.edit.php:309 +#: include/views/configuration.item.edit.php:314 +#: include/views/configuration.item.prototype.edit.php:299 msgid "HTTP authentication" msgstr "" -#: app/views/administration.authentication.edit.php:44 +#: app/views/administration.authentication.edit.php:45 msgid "HTTP login form" msgstr "" -#: include/views/configuration.host.discovery.edit.php:271 +#: include/views/configuration.host.discovery.edit.php:263 #: include/views/configuration.httpconf.edit.php:110 #: include/views/configuration.httpconf.list.php:93 -#: include/views/configuration.item.edit.php:312 -#: include/views/configuration.item.prototype.edit.php:300 +#: include/views/configuration.item.edit.php:306 +#: include/views/configuration.item.prototype.edit.php:291 msgid "HTTP proxy" msgstr "" -#: app/views/administration.authentication.edit.php:136 +#: app/views/administration.authentication.edit.php:146 msgid "HTTP settings" msgstr "" @@ -6729,14 +6738,14 @@ msgid "Hardware sensor reading. Returns float" msgstr "" #: app/views/popup.httpstep.php:95 app/views/popup.httpstep.php:143 -#: include/views/configuration.host.discovery.edit.php:201 -#: include/views/configuration.host.discovery.edit.php:262 +#: include/views/configuration.host.discovery.edit.php:197 +#: include/views/configuration.host.discovery.edit.php:255 #: include/views/configuration.httpconf.edit.php:117 -#: include/views/configuration.item.edit.php:233 -#: include/views/configuration.item.edit.php:294 -#: include/views/configuration.item.massupdate.php:149 -#: include/views/configuration.item.prototype.edit.php:221 -#: include/views/configuration.item.prototype.edit.php:282 +#: include/views/configuration.item.edit.php:232 +#: include/views/configuration.item.edit.php:290 +#: include/views/configuration.item.massupdate.php:147 +#: include/views/configuration.item.prototype.edit.php:217 +#: include/views/configuration.item.prototype.edit.php:275 #: include/views/configuration.item.prototype.massupdate.php:143 msgid "Headers" msgstr "" @@ -6760,7 +6769,7 @@ msgstr "" msgid "Help" msgstr "" -#: include/items.inc.php:1759 +#: include/items.inc.php:1757 msgid "Hexadecimal to decimal" msgstr "" @@ -6819,12 +6828,12 @@ msgid "History" msgstr "" #: httpconf.php:191 httpconf.php:198 httpconf.php:492 httpconf.php:504 -#: items.php:992 items.php:999 items.php:1382 items.php:1394 +#: items.php:992 items.php:999 items.php:1383 items.php:1395 msgid "History cleared" msgstr "" #: include/views/configuration.httpconf.edit.php:298 -#: include/views/configuration.item.edit.php:1183 +#: include/views/configuration.item.edit.php:945 msgid "History clearing can take a long time. Continue?" msgstr "" @@ -6845,10 +6854,10 @@ msgstr "" msgid "History of events" msgstr "" -#: disc_prototypes.php:193 include/views/configuration.item.edit.php:783 -#: include/views/configuration.item.massupdate.php:518 -#: include/views/configuration.item.prototype.edit.php:680 -#: include/views/configuration.item.prototype.massupdate.php:496 items.php:61 +#: disc_prototypes.php:193 include/views/configuration.item.edit.php:770 +#: include/views/configuration.item.massupdate.php:400 +#: include/views/configuration.item.prototype.edit.php:667 +#: include/views/configuration.item.prototype.massupdate.php:396 items.php:61 msgid "History storage period" msgstr "" @@ -6905,7 +6914,7 @@ msgstr "" #: include/views/monitoring.screen.constructor.edit.php:524 #: include/views/monitoring.screen.php:78 #: include/views/monitoring.slides.php:74 -#: include/views/reports.toptriggers.php:79 items.php:992 items.php:1381 +#: include/views/reports.toptriggers.php:79 items.php:992 items.php:1382 #: jsLoader.php:165 latest.php:421 latest.php:438 queue.php:254 #: report2.php:409 report2.php:431 msgid "Host" @@ -6919,10 +6928,10 @@ msgstr[0] "" msgid "Host \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1449 +#: include/classes/api/services/CHostGroup.php:1466 #: include/classes/api/services/CHost.php:806 -#: include/classes/api/services/CHost.php:1629 -#: include/classes/api/services/CHost.php:1805 +#: include/classes/api/services/CHost.php:1665 +#: include/classes/api/services/CHost.php:1841 #, c-format msgid "Host \"%1$s\" cannot be without host group." msgstr "" @@ -6992,17 +7001,17 @@ msgstr[0] "" msgid "Host group" msgstr "" -#: include/classes/api/services/CHostGroup.php:731 +#: include/classes/api/services/CHostGroup.php:643 #, c-format msgid "Host group \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:584 +#: include/classes/api/services/CHostGroup.php:748 #, c-format msgid "Host group \"%1$s\" cannot be deleted, because it is used in a global script." msgstr "" -#: include/classes/api/services/CHostGroup.php:537 +#: include/classes/api/services/CHostGroup.php:701 #, c-format msgid "Host group \"%1$s\" is internal and can not be deleted." msgstr "" @@ -7050,11 +7059,11 @@ msgstr "" msgid "Host info" msgstr "" -#: include/views/configuration.host.discovery.edit.php:387 -#: include/views/configuration.item.edit.php:435 -#: include/views/configuration.item.edit.php:479 -#: include/views/configuration.item.massupdate.php:85 -#: include/views/configuration.item.prototype.edit.php:466 +#: include/views/configuration.host.discovery.edit.php:366 +#: include/views/configuration.item.edit.php:420 +#: include/views/configuration.item.edit.php:464 +#: include/views/configuration.item.massupdate.php:84 +#: include/views/configuration.item.prototype.edit.php:449 #: include/views/configuration.item.prototype.massupdate.php:80 msgid "Host interface" msgstr "" @@ -7180,25 +7189,25 @@ msgstr "" msgid "Host with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CTemplate.php:1056 +#: include/classes/api/services/CTemplate.php:1054 #, c-format msgid "Host with the same name \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHost.php:1736 -#: include/classes/api/services/CHost.php:1955 +#: include/classes/api/services/CHost.php:1772 +#: include/classes/api/services/CHost.php:1991 #, c-format msgid "Host with the same name \"%s\" already exists." msgstr "" #: include/classes/api/services/CTemplate.php:460 -#: include/classes/api/services/CTemplate.php:1021 +#: include/classes/api/services/CTemplate.php:1019 #, c-format msgid "Host with the same visible name \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHost.php:1742 -#: include/classes/api/services/CHost.php:1962 +#: include/classes/api/services/CHost.php:1778 +#: include/classes/api/services/CHost.php:1998 #, c-format msgid "Host with the same visible name \"%s\" already exists." msgstr "" @@ -7246,7 +7255,7 @@ msgstr "" msgid "Hosts updated" msgstr "" -#: include/forms.inc.php:2118 +#: include/forms.inc.php:2366 msgid "Hours" msgstr "" @@ -7345,9 +7354,9 @@ msgid "IPMI scripts can be executed only by server." msgstr "" #: disc_prototypes.php:162 host_discovery.php:136 -#: include/views/configuration.host.discovery.edit.php:452 -#: include/views/configuration.item.edit.php:591 -#: include/views/configuration.item.prototype.edit.php:531 items.php:172 +#: include/views/configuration.host.discovery.edit.php:440 +#: include/views/configuration.item.edit.php:577 +#: include/views/configuration.item.prototype.edit.php:517 items.php:172 msgid "IPMI sensor" msgstr "" @@ -7527,7 +7536,7 @@ msgstr "" msgid "In progress" msgstr "" -#: include/items.inc.php:1765 +#: include/items.inc.php:1761 msgid "In range" msgstr "" @@ -7547,6 +7556,10 @@ msgstr "" msgid "Inaccessible item" msgstr "" +#: include/classes/screens/CScreenProblem.php:393 +msgid "Inaccessible maintenance" +msgstr "" + #: app/controllers/CControllerDashboardWidgetEdit.php:103 #: app/controllers/CControllerWidgetNavTreeItemEdit.php:84 msgid "Inaccessible map" @@ -7820,18 +7833,18 @@ msgstr "" #: include/classes/api/services/CHostPrototype.php:392 #: include/classes/api/services/CHostPrototype.php:413 #: include/classes/api/services/CItemGeneral.php:258 -#: include/classes/api/services/CItemGeneral.php:1171 -#: include/classes/api/services/CItemGeneral.php:1196 -#: include/classes/api/services/CItemGeneral.php:1219 -#: include/classes/api/services/CItemGeneral.php:1249 -#: include/classes/api/services/CItemGeneral.php:1263 -#: include/classes/api/services/CItemGeneral.php:1289 -#: include/classes/api/services/CItemGeneral.php:1335 -#: include/classes/api/services/CItemGeneral.php:1358 -#: include/classes/api/services/CItemGeneral.php:1409 -#: include/classes/api/services/CItemGeneral.php:1420 -#: include/classes/api/services/CItemGeneral.php:1435 -#: include/classes/api/services/CItemGeneral.php:1446 +#: include/classes/api/services/CItemGeneral.php:1261 +#: include/classes/api/services/CItemGeneral.php:1286 +#: include/classes/api/services/CItemGeneral.php:1309 +#: include/classes/api/services/CItemGeneral.php:1339 +#: include/classes/api/services/CItemGeneral.php:1353 +#: include/classes/api/services/CItemGeneral.php:1379 +#: include/classes/api/services/CItemGeneral.php:1425 +#: include/classes/api/services/CItemGeneral.php:1448 +#: include/classes/api/services/CItemGeneral.php:1499 +#: include/classes/api/services/CItemGeneral.php:1510 +#: include/classes/api/services/CItemGeneral.php:1525 +#: include/classes/api/services/CItemGeneral.php:1536 #: include/classes/api/services/CMapElement.php:46 #: include/classes/api/services/CMapElement.php:90 #: include/classes/api/services/CMapElement.php:109 @@ -7873,8 +7886,8 @@ msgid "Incorrect calculate SLA value for service \"%1$s\"." msgstr "" #: include/classes/api/services/CHost.php:826 -#: include/classes/api/services/CHost.php:1617 -#: include/classes/api/services/CHost.php:1873 +#: include/classes/api/services/CHost.php:1653 +#: include/classes/api/services/CHost.php:1909 #, c-format msgid "Incorrect characters used for host name \"%s\"." msgstr "" @@ -7886,7 +7899,7 @@ msgid "Incorrect characters used for proxy name \"%1$s\"." msgstr "" #: include/classes/api/services/CTemplate.php:411 -#: include/classes/api/services/CTemplate.php:1064 +#: include/classes/api/services/CTemplate.php:1062 #, c-format msgid "Incorrect characters used for template name \"%1$s\"." msgstr "" @@ -7896,7 +7909,7 @@ msgstr "" msgid "Incorrect conditions for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1074 +#: include/classes/api/services/CDiscoveryRule.php:1238 #, c-format msgid "Incorrect conditions for discovery rule \"%1$s\"." msgstr "" @@ -7915,7 +7928,7 @@ msgstr "" msgid "Incorrect custom expression \"%2$s\" for correlation \"%1$s\": %3$s." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1079 +#: include/classes/api/services/CDiscoveryRule.php:1243 #, c-format msgid "Incorrect custom expression \"%2$s\" for discovery rule \"%1$s\": %3$s." msgstr "" @@ -7960,7 +7973,7 @@ msgstr "" msgid "Incorrect filter condition formula ID for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1109 +#: include/classes/api/services/CDiscoveryRule.php:1273 #, c-format msgid "Incorrect filter condition formula ID for discovery rule \"%1$s\"." msgstr "" @@ -7970,7 +7983,7 @@ msgstr "" msgid "Incorrect filter condition formula ID given for correlation \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1101 +#: include/classes/api/services/CDiscoveryRule.php:1265 #, c-format msgid "Incorrect filter condition macro for discovery rule \"%1$s\"." msgstr "" @@ -7980,7 +7993,7 @@ msgstr "" msgid "Incorrect filter condition operator for action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1113 +#: include/classes/api/services/CDiscoveryRule.php:1277 #, c-format msgid "Incorrect filter condition operator for discovery rule \"%1$s\"." msgstr "" @@ -8028,8 +8041,8 @@ msgstr "" #: include/classes/api/services/CAction.php:2821 #: include/classes/api/services/CAction.php:2833 #: include/classes/api/services/CHost.php:812 -#: include/classes/api/services/CHost.php:1611 -#: include/classes/api/services/CHost.php:1792 +#: include/classes/api/services/CHost.php:1647 +#: include/classes/api/services/CHost.php:1828 #: include/classes/api/services/CImage.php:485 #: include/classes/api/services/CProxy.php:618 #: include/classes/api/services/CProxy.php:682 @@ -8052,8 +8065,8 @@ msgstr "" msgid "Incorrect interface port \"%s\" provided." msgstr "" -#: include/classes/api/services/CHost.php:1711 -#: include/classes/api/services/CHost.php:1855 +#: include/classes/api/services/CHost.php:1747 +#: include/classes/api/services/CHost.php:1891 #, c-format msgid "Incorrect inventory field \"%s\"." msgstr "" @@ -8091,7 +8104,7 @@ msgstr "" msgid "Incorrect item value type \"%1$s\" provided for trigger function \"%2$s\"." msgstr "" -#: include/forms.inc.php:1393 +#: include/forms.inc.php:1641 msgid "Incorrect list of items." msgstr "" @@ -8248,8 +8261,8 @@ msgstr "" msgid "Incorrect source value." msgstr "" -#: include/classes/api/services/CHost.php:1683 -#: include/classes/api/services/CHost.php:1823 +#: include/classes/api/services/CHost.php:1719 +#: include/classes/api/services/CHost.php:1859 #, c-format msgid "Incorrect status for host \"%1$s\"." msgstr "" @@ -8322,7 +8335,7 @@ msgstr "" msgid "Incorrect type of calculation for correlation \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1067 +#: include/classes/api/services/CDiscoveryRule.php:1231 #, c-format msgid "Incorrect type of calculation for discovery rule \"%1$s\"." msgstr "" @@ -8362,7 +8375,7 @@ msgstr "" #: include/classes/api/services/CAction.php:1745 #: include/classes/api/services/CAction.php:2777 #: include/classes/api/services/CAction.php:2921 -#: include/classes/api/services/CDiscoveryRule.php:1015 +#: include/classes/api/services/CDiscoveryRule.php:1179 #: include/classes/api/services/CDRule.php:237 #: include/classes/api/services/CDRule.php:244 #: include/classes/api/services/CDRule.php:292 @@ -8373,7 +8386,7 @@ msgstr "" #: include/classes/api/services/CDRule.php:558 #: include/classes/api/services/CDRule.php:571 #: include/classes/api/services/CItemGeneral.php:529 -#: include/classes/api/services/CItemGeneral.php:2206 +#: include/classes/api/services/CItemGeneral.php:2169 #: include/classes/validators/CNewValidator.php:116 #: include/classes/validators/CNewValidator.php:129 #: include/classes/validators/CNewValidator.php:142 @@ -8388,7 +8401,7 @@ msgstr "" msgid "Incorrect value \"%1$s\" for \"%2$s\" field." msgstr "" -#: app/controllers/CControllerAuthenticationUpdate.php:132 +#: app/controllers/CControllerAuthenticationUpdate.php:134 #: include/classes/api/services/CAction.php:1678 #: include/classes/api/services/CScreenItem.php:576 #: include/validate.inc.php:351 @@ -8471,8 +8484,8 @@ msgstr "" #: include/classes/api/services/CCorrelation.php:1101 #: include/classes/api/services/CCorrelation.php:1118 #: include/classes/api/services/CCorrelation.php:1137 -#: include/classes/api/services/CDiscoveryRule.php:1135 -#: include/classes/api/services/CDiscoveryRule.php:1359 +#: include/classes/api/services/CDiscoveryRule.php:1299 +#: include/classes/api/services/CDiscoveryRule.php:1665 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:209 #: include/classes/api/services/CDRule.php:214 @@ -8492,21 +8505,19 @@ msgstr "" #: include/classes/api/services/CEvent.php:804 #: include/classes/api/services/CEvent.php:847 #: include/classes/api/services/CEvent.php:904 -#: include/classes/api/services/CHostGeneral.php:1023 -#: include/classes/api/services/CHostGeneral.php:1030 #: include/classes/api/services/CHost.php:770 -#: include/classes/api/services/CHost.php:1515 -#: include/classes/api/services/CHost.php:1521 -#: include/classes/api/services/CHost.php:1536 -#: include/classes/api/services/CHost.php:1542 -#: include/classes/api/services/CHost.php:1547 -#: include/classes/api/services/CHost.php:1553 -#: include/classes/api/services/CHost.php:1561 -#: include/classes/api/services/CHost.php:1567 -#: include/classes/api/services/CHost.php:1576 -#: include/classes/api/services/CHost.php:1582 -#: include/classes/api/services/CHost.php:1677 -#: include/classes/api/services/CHost.php:1817 +#: include/classes/api/services/CHost.php:1551 +#: include/classes/api/services/CHost.php:1557 +#: include/classes/api/services/CHost.php:1572 +#: include/classes/api/services/CHost.php:1578 +#: include/classes/api/services/CHost.php:1583 +#: include/classes/api/services/CHost.php:1589 +#: include/classes/api/services/CHost.php:1597 +#: include/classes/api/services/CHost.php:1603 +#: include/classes/api/services/CHost.php:1612 +#: include/classes/api/services/CHost.php:1618 +#: include/classes/api/services/CHost.php:1713 +#: include/classes/api/services/CHost.php:1853 #: include/classes/api/services/CHttpTest.php:967 #: include/classes/api/services/CHttpTest.php:982 #: include/classes/api/services/CHttpTest.php:1076 @@ -8520,40 +8531,36 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:517 #: include/classes/api/services/CItemGeneral.php:523 #: include/classes/api/services/CItemGeneral.php:536 -#: include/classes/api/services/CItemGeneral.php:1201 -#: include/classes/api/services/CItemGeneral.php:1207 -#: include/classes/api/services/CItemGeneral.php:1223 -#: include/classes/api/services/CItemGeneral.php:1232 -#: include/classes/api/services/CItemGeneral.php:1254 -#: include/classes/api/services/CItemGeneral.php:1268 -#: include/classes/api/services/CItemGeneral.php:1275 -#: include/classes/api/services/CItemGeneral.php:1281 -#: include/classes/api/services/CItemGeneral.php:1294 -#: include/classes/api/services/CItemGeneral.php:1305 -#: include/classes/api/services/CItemGeneral.php:1315 +#: include/classes/api/services/CItemGeneral.php:1291 +#: include/classes/api/services/CItemGeneral.php:1297 +#: include/classes/api/services/CItemGeneral.php:1313 #: include/classes/api/services/CItemGeneral.php:1322 -#: include/classes/api/services/CItemGeneral.php:1340 -#: include/classes/api/services/CItemGeneral.php:1363 -#: include/classes/api/services/CItemGeneral.php:1413 -#: include/classes/api/services/CItemGeneral.php:1426 -#: include/classes/api/services/CItemGeneral.php:1439 -#: include/classes/api/services/CItemGeneral.php:1454 -#: include/classes/api/services/CItemGeneral.php:1464 -#: include/classes/api/services/CItemGeneral.php:1688 -#: include/classes/api/services/CItemGeneral.php:1729 -#: include/classes/api/services/CItemGeneral.php:1735 -#: include/classes/api/services/CItemGeneral.php:1752 -#: include/classes/api/services/CItemGeneral.php:1759 -#: include/classes/api/services/CItemGeneral.php:1765 -#: include/classes/api/services/CItemGeneral.php:1850 -#: include/classes/api/services/CItemGeneral.php:1859 -#: include/classes/api/services/CItemGeneral.php:1972 -#: include/classes/api/services/CItemGeneral.php:1979 -#: include/classes/api/services/CItemGeneral.php:2145 -#: include/classes/api/services/CItem.php:774 -#: include/classes/api/services/CItem.php:782 -#: include/classes/api/services/CItemPrototype.php:944 -#: include/classes/api/services/CItemPrototype.php:952 +#: include/classes/api/services/CItemGeneral.php:1344 +#: include/classes/api/services/CItemGeneral.php:1358 +#: include/classes/api/services/CItemGeneral.php:1365 +#: include/classes/api/services/CItemGeneral.php:1371 +#: include/classes/api/services/CItemGeneral.php:1384 +#: include/classes/api/services/CItemGeneral.php:1395 +#: include/classes/api/services/CItemGeneral.php:1405 +#: include/classes/api/services/CItemGeneral.php:1412 +#: include/classes/api/services/CItemGeneral.php:1430 +#: include/classes/api/services/CItemGeneral.php:1453 +#: include/classes/api/services/CItemGeneral.php:1503 +#: include/classes/api/services/CItemGeneral.php:1516 +#: include/classes/api/services/CItemGeneral.php:1529 +#: include/classes/api/services/CItemGeneral.php:1544 +#: include/classes/api/services/CItemGeneral.php:1554 +#: include/classes/api/services/CItemGeneral.php:1810 +#: include/classes/api/services/CItemGeneral.php:1830 +#: include/classes/api/services/CItemGeneral.php:1837 +#: include/classes/api/services/CItemGeneral.php:1847 +#: include/classes/api/services/CItemGeneral.php:1927 +#: include/classes/api/services/CItemGeneral.php:1941 +#: include/classes/api/services/CItemGeneral.php:2108 +#: include/classes/api/services/CItem.php:787 +#: include/classes/api/services/CItem.php:795 +#: include/classes/api/services/CItemPrototype.php:958 +#: include/classes/api/services/CItemPrototype.php:966 #: include/classes/api/services/CMaintenance.php:468 #: include/classes/api/services/CMaintenance.php:637 #: include/classes/api/services/CMapElement.php:74 @@ -8619,12 +8626,12 @@ msgstr "" #: include/classes/helpers/CSvgGraphHelper.php:248 #: include/classes/import/CConfigurationImport.php:807 #: include/classes/import/CConfigurationImport.php:845 -#: include/classes/import/CConfigurationImport.php:2460 -#: include/classes/import/CConfigurationImport.php:2564 -#: include/classes/import/CConfigurationImport.php:2574 -#: include/classes/import/CConfigurationImport.php:2610 -#: include/classes/import/CConfigurationImport.php:2619 -#: include/classes/import/CConfigurationImport.php:2625 +#: include/classes/import/CConfigurationImport.php:2468 +#: include/classes/import/CConfigurationImport.php:2572 +#: include/classes/import/CConfigurationImport.php:2582 +#: include/classes/import/CConfigurationImport.php:2618 +#: include/classes/import/CConfigurationImport.php:2627 +#: include/classes/import/CConfigurationImport.php:2633 #: include/classes/validators/CNewValidator.php:91 #: include/classes/validators/CNewValidator.php:101 #: include/classes/validators/CNewValidator.php:266 @@ -8637,7 +8644,7 @@ msgstr "" msgid "Incorrect value for field \"%1$s\": %2$s." msgstr "" -#: app/controllers/CControllerAuthenticationUpdate.php:124 +#: app/controllers/CControllerAuthenticationUpdate.php:126 #: app/controllers/CControllerPopupTriggerWizard.php:125 #: include/validate.inc.php:346 #, c-format @@ -8805,15 +8812,15 @@ msgid "Internet Explorer" msgstr "" #: include/forms.inc.php:882 include/views/configuration.discovery.list.php:62 -#: include/views/configuration.host.discovery.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:506 #: include/views/configuration.host.discovery.list.php:57 #: include/views/configuration.httpconf.list.php:90 -#: include/views/configuration.item.edit.php:700 +#: include/views/configuration.item.edit.php:687 #: include/views/configuration.item.list.php:66 -#: include/views/configuration.item.massupdate.php:456 -#: include/views/configuration.item.prototype.edit.php:629 +#: include/views/configuration.item.massupdate.php:338 +#: include/views/configuration.item.prototype.edit.php:616 #: include/views/configuration.item.prototype.list.php:54 -#: include/views/configuration.item.prototype.massupdate.php:434 +#: include/views/configuration.item.prototype.massupdate.php:334 #: include/views/configuration.services.edit.php:170 latest.php:423 msgid "Interval" msgstr "" @@ -8904,24 +8911,24 @@ msgstr "" #: disc_prototypes.php:394 disc_prototypes.php:399 disc_prototypes.php:412 #: disc_prototypes.php:730 disc_prototypes.php:735 disc_prototypes.php:748 -#: host_discovery.php:310 host_discovery.php:315 host_discovery.php:328 +#: host_discovery.php:315 host_discovery.php:320 host_discovery.php:333 #: items.php:617 items.php:622 items.php:635 items.php:1025 items.php:1030 #: items.php:1043 #, c-format msgid "Invalid interval \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:37 +#: include/classes/api/services/CDiscoveryRule.php:48 #, c-format msgid "Invalid key \"%1$s\" for discovery rule \"%2$s\" on \"%3$s\": %4$s." msgstr "" -#: include/classes/api/services/CItem.php:37 +#: include/classes/api/services/CItem.php:52 #, c-format msgid "Invalid key \"%1$s\" for item \"%2$s\" on \"%3$s\": %4$s." msgstr "" -#: include/classes/api/services/CItemPrototype.php:37 +#: include/classes/api/services/CItemPrototype.php:52 #, c-format msgid "Invalid key \"%1$s\" for item prototype \"%2$s\" on \"%3$s\": %4$s." msgstr "" @@ -8964,65 +8971,72 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:125 #: app/controllers/CControllerDashboardUpdate.php:134 #: app/controllers/CControllerDashboardUpdate.php:142 -#: include/classes/api/services/CItemGeneral.php:2161 -#: include/classes/api/services/CItemGeneral.php:2168 -#: include/classes/api/services/CItemGeneral.php:2176 -#: include/classes/api/services/CItemGeneral.php:2185 -#: include/classes/api/services/CItemGeneral.php:2192 +#: include/classes/api/services/CDiscoveryRule.php:1319 +#: include/classes/api/services/CDiscoveryRule.php:1405 +#: include/classes/api/services/CDiscoveryRule.php:1422 +#: include/classes/api/services/CDiscoveryRule.php:1440 +#: include/classes/api/services/CDiscoveryRule.php:1448 +#: include/classes/api/services/CItemGeneral.php:2124 +#: include/classes/api/services/CItemGeneral.php:2131 +#: include/classes/api/services/CItemGeneral.php:2139 +#: include/classes/api/services/CItemGeneral.php:2148 +#: include/classes/api/services/CItemGeneral.php:2155 #: include/classes/api/services/CUser.php:649 #: include/classes/api/services/CUser.php:660 -#: include/classes/validators/CApiInputValidator.php:230 -#: include/classes/validators/CApiInputValidator.php:235 -#: include/classes/validators/CApiInputValidator.php:240 -#: include/classes/validators/CApiInputValidator.php:270 -#: include/classes/validators/CApiInputValidator.php:331 -#: include/classes/validators/CApiInputValidator.php:338 -#: include/classes/validators/CApiInputValidator.php:370 -#: include/classes/validators/CApiInputValidator.php:375 -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:422 -#: include/classes/validators/CApiInputValidator.php:475 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:513 -#: include/classes/validators/CApiInputValidator.php:554 -#: include/classes/validators/CApiInputValidator.php:559 -#: include/classes/validators/CApiInputValidator.php:564 -#: include/classes/validators/CApiInputValidator.php:593 -#: include/classes/validators/CApiInputValidator.php:648 -#: include/classes/validators/CApiInputValidator.php:655 -#: include/classes/validators/CApiInputValidator.php:682 -#: include/classes/validators/CApiInputValidator.php:727 -#: include/classes/validators/CApiInputValidator.php:756 -#: include/classes/validators/CApiInputValidator.php:761 -#: include/classes/validators/CApiInputValidator.php:798 -#: include/classes/validators/CApiInputValidator.php:803 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:855 -#: include/classes/validators/CApiInputValidator.php:861 -#: include/classes/validators/CApiInputValidator.php:889 -#: include/classes/validators/CApiInputValidator.php:899 -#: include/classes/validators/CApiInputValidator.php:905 -#: include/classes/validators/CApiInputValidator.php:941 -#: include/classes/validators/CApiInputValidator.php:952 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:986 -#: include/classes/validators/CApiInputValidator.php:996 -#: include/classes/validators/CApiInputValidator.php:1021 -#: include/classes/validators/CApiInputValidator.php:1026 -#: include/classes/validators/CApiInputValidator.php:1052 +#: include/classes/validators/CApiInputValidator.php:234 +#: include/classes/validators/CApiInputValidator.php:239 +#: include/classes/validators/CApiInputValidator.php:244 +#: include/classes/validators/CApiInputValidator.php:274 +#: include/classes/validators/CApiInputValidator.php:335 +#: include/classes/validators/CApiInputValidator.php:342 +#: include/classes/validators/CApiInputValidator.php:374 +#: include/classes/validators/CApiInputValidator.php:379 +#: include/classes/validators/CApiInputValidator.php:421 +#: include/classes/validators/CApiInputValidator.php:426 +#: include/classes/validators/CApiInputValidator.php:479 +#: include/classes/validators/CApiInputValidator.php:512 +#: include/classes/validators/CApiInputValidator.php:517 +#: include/classes/validators/CApiInputValidator.php:558 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:597 +#: include/classes/validators/CApiInputValidator.php:652 +#: include/classes/validators/CApiInputValidator.php:659 +#: include/classes/validators/CApiInputValidator.php:686 +#: include/classes/validators/CApiInputValidator.php:731 +#: include/classes/validators/CApiInputValidator.php:760 +#: include/classes/validators/CApiInputValidator.php:765 +#: include/classes/validators/CApiInputValidator.php:802 +#: include/classes/validators/CApiInputValidator.php:807 +#: include/classes/validators/CApiInputValidator.php:850 +#: include/classes/validators/CApiInputValidator.php:859 +#: include/classes/validators/CApiInputValidator.php:865 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:903 +#: include/classes/validators/CApiInputValidator.php:909 +#: include/classes/validators/CApiInputValidator.php:945 +#: include/classes/validators/CApiInputValidator.php:956 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:990 +#: include/classes/validators/CApiInputValidator.php:1000 +#: include/classes/validators/CApiInputValidator.php:1025 +#: include/classes/validators/CApiInputValidator.php:1030 +#: include/classes/validators/CApiInputValidator.php:1054 #: include/classes/validators/CApiInputValidator.php:1059 -#: include/classes/validators/CApiInputValidator.php:1086 -#: include/classes/validators/CApiInputValidator.php:1093 -#: include/classes/validators/CApiInputValidator.php:1120 -#: include/classes/validators/CApiInputValidator.php:1129 -#: include/classes/validators/CApiInputValidator.php:1174 -#: include/classes/validators/CApiInputValidator.php:1185 +#: include/classes/validators/CApiInputValidator.php:1085 +#: include/classes/validators/CApiInputValidator.php:1092 +#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1126 +#: include/classes/validators/CApiInputValidator.php:1153 +#: include/classes/validators/CApiInputValidator.php:1162 +#: include/classes/validators/CApiInputValidator.php:1207 #: include/classes/validators/CApiInputValidator.php:1218 -#: include/classes/validators/CApiInputValidator.php:1273 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1365 -#: include/classes/validators/CApiInputValidator.php:1392 -#: include/classes/validators/CApiInputValidator.php:1397 +#: include/classes/validators/CApiInputValidator.php:1251 +#: include/classes/validators/CApiInputValidator.php:1306 +#: include/classes/validators/CApiInputValidator.php:1393 +#: include/classes/validators/CApiInputValidator.php:1398 +#: include/classes/validators/CApiInputValidator.php:1425 +#: include/classes/validators/CApiInputValidator.php:1430 #: include/classes/widgets/fields/CWidgetFieldGraphOverride.php:133 #: include/classes/widgets/forms/CWidgetFormMap.php:101 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:479 @@ -9064,7 +9078,7 @@ msgstr "" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 #: include/classes/import/validators/CXmlValidatorGeneral.php:90 #: include/classes/import/validators/CXmlValidatorGeneral.php:105 #: include/classes/import/validators/CXmlValidatorGeneral.php:124 @@ -9155,12 +9169,12 @@ msgstr "" #: include/classes/screens/CScreenPlainText.php:42 #: include/classes/widgets/forms/CWidgetFormClock.php:48 #: include/classes/widgets/forms/CWidgetFormGraph.php:48 -#: include/forms.inc.php:1119 include/views/configuration.graph.edit.php:157 +#: include/forms.inc.php:1116 include/views/configuration.graph.edit.php:157 #: include/views/configuration.graph.edit.php:238 #: include/views/monitoring.screen.constructor.edit.php:258 #: include/views/monitoring.screen.constructor.edit.php:427 #: include/views/monitoring.screen.constructor.edit.php:773 items.php:991 -#: items.php:1381 +#: items.php:1382 msgid "Item" msgstr "" @@ -9170,17 +9184,17 @@ msgid "Item \"%1$s\"" msgstr "" #: include/classes/api/services/CHostPrototype.php:973 -#: include/classes/api/services/CItem.php:35 +#: include/classes/api/services/CItem.php:50 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "" -#: include/classes/api/services/CItem.php:36 +#: include/classes/api/services/CItem.php:51 #, c-format msgid "Item \"%1$s\" already exists on \"%2$s\"." msgstr "" -#: include/classes/api/services/CItem.php:954 +#: include/classes/api/services/CItem.php:904 #, c-format msgid "Item \"%1$s\" cannot populate a missing host inventory field number \"%2$d\". Choices are: from 0 (do not populate) to %3$d." msgstr "" @@ -9190,8 +9204,8 @@ msgstr "" msgid "Item \"%1$s\" does not exist on template \"%2$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1360 -#: include/classes/api/services/CItemGeneral.php:1689 +#: include/classes/api/services/CDiscoveryRule.php:1666 +#: include/classes/api/services/CItemGeneral.php:1811 #, c-format msgid "Item \"%1$s\" does not exist or you have no access to this item" msgstr "" @@ -9215,7 +9229,7 @@ msgstr "" msgid "Item added" msgstr "" -#: items.php:1349 +#: items.php:1350 msgid "Item copied" msgid_plural "Items copied" msgstr[0] "" @@ -9228,12 +9242,12 @@ msgstr "" msgid "Item deleted" msgstr "" -#: applications.php:172 items.php:1307 +#: applications.php:172 items.php:1308 msgid "Item disabled" msgid_plural "Items disabled" msgstr[0] "" -#: applications.php:171 items.php:1306 +#: applications.php:171 items.php:1307 msgid "Item enabled" msgid_plural "Items enabled" msgstr[0] "" @@ -9246,31 +9260,27 @@ msgstr "" msgid "Item not selected" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1191 +#: include/classes/api/services/CItemGeneral.php:1281 #, c-format msgid "Item pre-processing is missing parameters: %1$s" msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1140 -msgid "Item pre-processing is not allowed for discovery rules." -msgstr "" - -#: include/audit.inc.php:39 include/forms.inc.php:1119 +#: include/audit.inc.php:39 include/forms.inc.php:1116 #: include/views/monitoring.screen.constructor.edit.php:351 msgid "Item prototype" msgstr "" -#: include/classes/api/services/CItemPrototype.php:35 +#: include/classes/api/services/CItemPrototype.php:50 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\", inherited from another template." msgstr "" -#: include/classes/api/services/CItemGeneral.php:1006 +#: include/classes/api/services/CItemGeneral.php:1041 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\", linked to another rule." msgstr "" -#: include/classes/api/services/CItemPrototype.php:36 +#: include/classes/api/services/CItemPrototype.php:51 #, c-format msgid "Item prototype \"%1$s\" already exists on \"%2$s\"." msgstr "" @@ -9307,7 +9317,7 @@ msgstr "" msgid "Item prototypes deleted" msgstr "" -#: disc_prototypes.php:1103 +#: disc_prototypes.php:1116 msgid "Item prototypes updated" msgstr "" @@ -9344,32 +9354,32 @@ msgstr "" msgid "Item with ID \"%1$s\" is not available." msgstr "" -#: include/classes/api/services/CItemGeneral.php:721 +#: include/classes/api/services/CItemGeneral.php:670 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as a discovery rule." msgstr "" -#: include/classes/api/services/CItemGeneral.php:727 +#: include/classes/api/services/CItemGeneral.php:676 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item created from item prototype." msgstr "" -#: include/classes/api/services/CItemGeneral.php:724 +#: include/classes/api/services/CItemGeneral.php:673 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item prototype." msgstr "" -#: include/classes/api/services/CItemGeneral.php:718 +#: include/classes/api/services/CItemGeneral.php:667 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as an item." msgstr "" -#: include/classes/api/services/CItemGeneral.php:730 +#: include/classes/api/services/CItemGeneral.php:679 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\" as unknown item element." msgstr "" -#: include/classes/api/services/CItemGeneral.php:1581 +#: include/classes/api/services/CItemGeneral.php:1671 #, c-format msgid "Item with key \"%1$s\" already exists on \"%2$s\"." msgstr "" @@ -9393,11 +9403,11 @@ msgstr "" #: include/views/configuration.template.list.php:87 #: include/views/configuration.template.list.php:188 #: include/views/conf.import.php:34 include/views/inventory.host.view.php:151 -#: include/views/inventory.host.view.php:162 items.php:1701 queue.php:109 +#: include/views/inventory.host.view.php:162 items.php:1712 queue.php:109 msgid "Items" msgstr "" -#: items.php:1404 +#: items.php:1405 msgid "Items deleted" msgstr "" @@ -9409,7 +9419,7 @@ msgstr "" msgid "Items location" msgstr "" -#: items.php:1286 +#: items.php:1287 msgid "Items updated" msgstr "" @@ -9421,10 +9431,10 @@ msgstr "" msgid "JMX agent" msgstr "" -#: include/views/configuration.host.discovery.edit.php:465 -#: include/views/configuration.item.edit.php:612 +#: include/views/configuration.host.discovery.edit.php:454 +#: include/views/configuration.item.edit.php:599 #: include/views/configuration.item.massupdate.php:97 -#: include/views/configuration.item.prototype.edit.php:544 +#: include/views/configuration.item.prototype.edit.php:531 #: include/views/configuration.item.prototype.massupdate.php:93 msgid "JMX endpoint" msgstr "" @@ -9436,14 +9446,10 @@ msgstr "" msgid "JMX interfaces" msgstr "" -#: include/items.inc.php:1738 -msgid "JSON Path" -msgstr "" - -#: include/views/configuration.host.discovery.edit.php:172 -#: include/views/configuration.item.edit.php:204 -#: include/views/configuration.item.massupdate.php:119 -#: include/views/configuration.item.prototype.edit.php:192 +#: include/views/configuration.host.discovery.edit.php:168 +#: include/views/configuration.item.edit.php:203 +#: include/views/configuration.item.massupdate.php:117 +#: include/views/configuration.item.prototype.edit.php:188 #: include/views/configuration.item.prototype.massupdate.php:113 msgid "JSON data" msgstr "" @@ -9469,6 +9475,11 @@ msgstr "" msgid "JSON-rpc version is not specified." msgstr "" +#: include/items.inc.php:1733 +#: include/views/configuration.host.discovery.edit.php:681 +msgid "JSONPath" +msgstr "" + #: app/views/administration.mediatype.edit.php:53 include/media.inc.php:27 msgid "Jabber" msgstr "" @@ -9482,7 +9493,7 @@ msgstr "" msgid "Jan" msgstr "" -#: include/forms.inc.php:1956 include/func.inc.php:116 +#: include/forms.inc.php:2204 include/func.inc.php:116 #: include/func.inc.php:253 jsLoader.php:133 msgid "January" msgstr "" @@ -9495,7 +9506,7 @@ msgstr "" msgid "Jul" msgstr "" -#: include/forms.inc.php:1959 include/func.inc.php:122 +#: include/forms.inc.php:2207 include/func.inc.php:122 #: include/func.inc.php:259 jsLoader.php:139 msgid "July" msgstr "" @@ -9504,12 +9515,12 @@ msgstr "" msgid "Jun" msgstr "" -#: include/forms.inc.php:1996 include/func.inc.php:121 +#: include/forms.inc.php:2244 include/func.inc.php:121 #: include/func.inc.php:258 jsLoader.php:138 msgid "June" msgstr "" -#: include/views/configuration.host.discovery.edit.php:565 +#: include/views/configuration.host.discovery.edit.php:554 msgid "Keep lost resources period" msgstr "" @@ -9517,11 +9528,11 @@ msgstr "" #: app/controllers/CControllerPopupGeneric.php:222 #: app/controllers/CControllerPopupGeneric.php:274 disc_prototypes.php:46 #: host_discovery.php:50 include/forms.inc.php:469 -#: include/views/configuration.host.discovery.edit.php:68 +#: include/views/configuration.host.discovery.edit.php:67 #: include/views/configuration.host.discovery.list.php:56 -#: include/views/configuration.item.edit.php:104 +#: include/views/configuration.item.edit.php:106 #: include/views/configuration.item.list.php:65 -#: include/views/configuration.item.prototype.edit.php:93 +#: include/views/configuration.item.prototype.edit.php:92 #: include/views/configuration.item.prototype.list.php:53 #: include/views/js/configuration.discovery.edit.js.php:56 items.php:47 msgid "Key" @@ -9535,7 +9546,7 @@ msgstr "" #: include/views/configuration.action.edit.php:987 #: include/views/configuration.action.edit.php:1774 #: include/views/configuration.action.edit.php:2229 -#: include/views/js/common.item.edit.js.php:518 +#: include/views/js/common.item.edit.js.php:248 msgid "Key passphrase" msgstr "" @@ -9561,7 +9572,7 @@ msgstr "" msgid "LDAP authentication" msgstr "" -#: app/views/administration.authentication.edit.php:83 +#: app/views/administration.authentication.edit.php:86 msgid "LDAP host" msgstr "" @@ -9569,18 +9580,27 @@ msgstr "" msgid "LDAP is not configured" msgstr "" -#: app/controllers/CControllerAuthenticationUpdate.php:180 +#: app/controllers/CControllerAuthenticationUpdate.php:182 msgid "LDAP login successful" msgstr "" -#: app/views/administration.authentication.edit.php:137 +#: app/views/administration.authentication.edit.php:147 msgid "LDAP settings" msgstr "" +#: include/views/configuration.host.discovery.edit.php:681 +msgid "LLD macro" +msgstr "" + +#: include/views/configuration.host.discovery.edit.php:733 +#: include/views/configuration.host.discovery.edit.php:748 +msgid "LLD macros" +msgstr "" + #: include/maps.inc.php:45 include/views/configuration.action.edit.php:51 #: include/views/configuration.action.edit.php:1100 #: include/views/configuration.correlation.edit.php:48 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/js/monitoring.sysmaps.js.php:111 #: include/views/js/monitoring.sysmaps.js.php:582 #: include/views/js/monitoring.sysmaps.js.php:690 @@ -9735,7 +9755,7 @@ msgstr "" msgid "Left Y" msgstr "" -#: include/items.inc.php:1731 +#: include/items.inc.php:1725 msgid "Left trim" msgstr "" @@ -9905,9 +9925,9 @@ msgid "Location longitude" msgstr "" #: include/forms.inc.php:354 include/items.inc.php:133 -#: include/views/configuration.item.edit.php:679 -#: include/views/configuration.item.massupdate.php:280 -#: include/views/configuration.item.prototype.edit.php:608 +#: include/views/configuration.item.edit.php:666 +#: include/views/configuration.item.massupdate.php:268 +#: include/views/configuration.item.prototype.edit.php:595 #: include/views/configuration.item.prototype.massupdate.php:263 msgid "Log" msgstr "" @@ -9920,10 +9940,10 @@ msgstr "" msgid "Log file monitoring. Returns log" msgstr "" -#: include/views/configuration.item.edit.php:813 -#: include/views/configuration.item.massupdate.php:544 -#: include/views/configuration.item.prototype.edit.php:692 -#: include/views/configuration.item.prototype.massupdate.php:525 +#: include/views/configuration.item.edit.php:798 +#: include/views/configuration.item.massupdate.php:427 +#: include/views/configuration.item.prototype.edit.php:679 +#: include/views/configuration.item.prototype.massupdate.php:425 msgid "Log time format" msgstr "" @@ -9931,7 +9951,7 @@ msgstr "" msgid "Log unmatched SNMP traps" msgstr "" -#: app/views/administration.authentication.edit.php:115 auditlogs.php:138 +#: app/views/administration.authentication.edit.php:123 auditlogs.php:138 #: include/func.inc.php:1790 include/func.inc.php:1805 #: include/menu.inc.php:294 include/views/administration.auditlogs.list.php:44 #: include/views/administration.users.list.php:89 index_http.php:91 @@ -9986,11 +10006,11 @@ msgid "MD2" msgstr "" #: include/hosts.inc.php:34 -#: include/views/configuration.host.discovery.edit.php:426 -#: include/views/configuration.item.edit.php:536 -#: include/views/configuration.item.edit.php:543 -#: include/views/configuration.item.massupdate.php:225 -#: include/views/configuration.item.prototype.edit.php:505 +#: include/views/configuration.host.discovery.edit.php:414 +#: include/views/configuration.item.edit.php:522 +#: include/views/configuration.item.edit.php:529 +#: include/views/configuration.item.massupdate.php:218 +#: include/views/configuration.item.prototype.edit.php:491 #: include/views/configuration.item.prototype.massupdate.php:214 #: include/views/js/configuration.discovery.edit.js.php:97 msgid "MD5" @@ -10003,7 +10023,7 @@ msgstr "" #: include/audit.inc.php:52 #: include/views/administration.general.macros.edit.php:38 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/views/configuration.host.discovery.edit.php:605 #: include/views/hostmacros.php:46 include/views/hostmacros.php:50 msgid "Macro" msgstr "" @@ -10100,7 +10120,7 @@ msgstr "" msgid "Maintenance period" msgstr "" -#: include/forms.inc.php:2112 +#: include/forms.inc.php:2360 msgid "Maintenance period length" msgstr "" @@ -10247,7 +10267,7 @@ msgstr "" msgid "Mar" msgstr "" -#: include/forms.inc.php:1972 include/func.inc.php:118 +#: include/forms.inc.php:2220 include/func.inc.php:118 #: include/func.inc.php:255 jsLoader.php:135 msgid "March" msgstr "" @@ -10271,9 +10291,9 @@ msgstr "" #: include/classes/screens/CScreenProblem.php:1095 #: include/views/configuration.host.list.php:360 #: include/views/configuration.item.list.php:291 -#: include/views/configuration.item.massupdate.php:691 +#: include/views/configuration.item.massupdate.php:575 #: include/views/configuration.item.prototype.list.php:176 -#: include/views/configuration.item.prototype.massupdate.php:686 +#: include/views/configuration.item.prototype.massupdate.php:586 #: include/views/configuration.trigger.prototype.list.php:164 #: include/views/configuration.trigger.prototype.massupdate.php:184 #: include/views/configuration.triggers.list.php:304 @@ -10289,14 +10309,14 @@ msgstr "" msgid "Mass update shapes" msgstr "" -#: disc_prototypes.php:51 include/views/configuration.item.edit.php:396 -#: include/views/configuration.item.massupdate.php:676 -#: include/views/configuration.item.prototype.edit.php:428 -#: include/views/configuration.item.prototype.massupdate.php:669 items.php:51 +#: disc_prototypes.php:51 include/views/configuration.item.edit.php:381 +#: include/views/configuration.item.massupdate.php:558 +#: include/views/configuration.item.prototype.edit.php:411 +#: include/views/configuration.item.prototype.massupdate.php:569 items.php:51 msgid "Master item" msgstr "" -#: include/items.inc.php:1766 +#: include/items.inc.php:1765 msgid "Matches regular expression" msgstr "" @@ -10345,7 +10365,7 @@ msgstr[0] "" msgid "Maximum total length of email address exceeded for media type with ID \"%1$s\"." msgstr "" -#: include/forms.inc.php:1988 include/func.inc.php:120 +#: include/forms.inc.php:2236 include/func.inc.php:120 #: include/func.inc.php:257 jsLoader.php:137 msgid "May" msgstr "" @@ -10533,7 +10553,7 @@ msgid "Minimum time period to display is %1$s minute." msgid_plural "Minimum time period to display is %1$s minutes." msgstr[0] "" -#: include/forms.inc.php:2120 +#: include/forms.inc.php:2368 msgid "Minutes" msgstr "" @@ -10546,7 +10566,7 @@ msgstr "" msgid "Missing \"itemid\" field for item." msgstr "" -#: include/classes/api/services/CItemPrototype.php:312 +#: include/classes/api/services/CItemPrototype.php:327 #, c-format msgid "Missing \"name\" field for application prototype in item prototype \"%1$s\"." msgstr "" @@ -10596,7 +10616,7 @@ msgstr "" msgid "Mon" msgstr "" -#: include/forms.inc.php:1912 include/forms.inc.php:2027 +#: include/forms.inc.php:2160 include/forms.inc.php:2275 #: include/func.inc.php:135 include/func.inc.php:225 jsLoader.php:145 msgid "Monday" msgstr "" @@ -10623,11 +10643,11 @@ msgstr "" msgid "Monospace" msgstr "" -#: app/views/report.services.php:67 include/forms.inc.php:1952 report4.php:166 +#: app/views/report.services.php:67 include/forms.inc.php:2200 report4.php:166 msgid "Month" msgstr "" -#: app/views/report.services.php:36 include/forms.inc.php:1877 +#: app/views/report.services.php:36 include/forms.inc.php:2125 #: include/maintenances.inc.php:37 report4.php:109 msgid "Monthly" msgstr "" @@ -10674,9 +10694,9 @@ msgid "NNTP" msgstr "" #: include/httptest.inc.php:29 -#: include/views/configuration.host.discovery.edit.php:286 -#: include/views/configuration.item.edit.php:327 -#: include/views/configuration.item.prototype.edit.php:315 +#: include/views/configuration.host.discovery.edit.php:277 +#: include/views/configuration.item.edit.php:320 +#: include/views/configuration.item.prototype.edit.php:305 msgid "NTLM" msgstr "" @@ -10720,7 +10740,7 @@ msgstr "" #: disc_prototypes.php:42 graphs.php:42 host_discovery.php:48 httpconf.php:42 #: include/classes/screens/CScreenHttpTest.php:116 #: include/classes/widgets/CWidgetHelper.php:51 include/forms.inc.php:450 -#: include/hosts.inc.php:109 +#: include/forms.inc.php:1396 include/hosts.inc.php:109 #: include/views/administration.general.iconmap.edit.php:43 #: include/views/administration.general.iconmap.list.php:37 #: include/views/administration.general.image.edit.php:42 @@ -10748,9 +10768,9 @@ msgstr "" #: include/views/configuration.graph.edit.php:78 #: include/views/configuration.graph.edit.php:330 #: include/views/configuration.graph.list.php:87 -#: include/views/configuration.host.discovery.edit.php:46 -#: include/views/configuration.host.discovery.edit.php:110 -#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:44 +#: include/views/configuration.host.discovery.edit.php:109 +#: include/views/configuration.host.discovery.edit.php:201 #: include/views/configuration.host.discovery.list.php:51 #: include/views/configuration.host.edit.php:546 #: include/views/configuration.host.edit.php:623 @@ -10766,20 +10786,16 @@ msgstr "" #: include/views/configuration.httpconf.edit.php:195 #: include/views/configuration.httpconf.list.php:88 #: include/views/configuration.item.edit.php:63 -#: include/views/configuration.item.edit.php:142 -#: include/views/configuration.item.edit.php:237 -#: include/views/configuration.item.edit.php:935 +#: include/views/configuration.item.edit.php:144 +#: include/views/configuration.item.edit.php:236 #: include/views/configuration.item.list.php:63 #: include/views/configuration.item.list.php:150 -#: include/views/configuration.item.massupdate.php:154 -#: include/views/configuration.item.massupdate.php:341 -#: include/views/configuration.item.prototype.edit.php:51 -#: include/views/configuration.item.prototype.edit.php:130 -#: include/views/configuration.item.prototype.edit.php:225 -#: include/views/configuration.item.prototype.edit.php:768 +#: include/views/configuration.item.massupdate.php:152 +#: include/views/configuration.item.prototype.edit.php:49 +#: include/views/configuration.item.prototype.edit.php:129 +#: include/views/configuration.item.prototype.edit.php:221 #: include/views/configuration.item.prototype.list.php:52 #: include/views/configuration.item.prototype.massupdate.php:148 -#: include/views/configuration.item.prototype.massupdate.php:318 #: include/views/configuration.maintenance.edit.php:40 #: include/views/configuration.maintenance.list.php:45 #: include/views/configuration.maintenance.list.php:70 @@ -10879,12 +10895,12 @@ msgid "New" msgstr "" #: include/views/configuration.httpconf.edit.php:75 -#: include/views/configuration.item.edit.php:876 -#: include/views/configuration.item.prototype.edit.php:725 +#: include/views/configuration.item.edit.php:861 +#: include/views/configuration.item.prototype.edit.php:714 msgid "New application" msgstr "" -#: include/views/configuration.item.prototype.edit.php:739 +#: include/views/configuration.item.prototype.edit.php:728 msgid "New application prototype" msgstr "" @@ -11021,7 +11037,7 @@ msgstr "" msgid "No \"%2$s\" given for a filter condition of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1117 +#: include/classes/api/services/CDiscoveryRule.php:1281 #, c-format msgid "No \"%2$s\" given for a filter condition of discovery rule \"%1$s\"." msgstr "" @@ -11031,7 +11047,7 @@ msgstr "" msgid "No \"%2$s\" given for the filter of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1085 +#: include/classes/api/services/CDiscoveryRule.php:1249 #, c-format msgid "No \"%2$s\" given for the filter of discovery rule \"%1$s\"." msgstr "" @@ -11134,7 +11150,7 @@ msgstr "" msgid "No details" msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:603 +#: include/classes/api/services/CDiscoveryRule.php:618 msgid "No discovery rule IDs given." msgstr "" @@ -11175,7 +11191,7 @@ msgstr "" msgid "No graphs added." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:606 +#: include/classes/api/services/CDiscoveryRule.php:621 msgid "No host IDs given." msgstr "" @@ -11212,10 +11228,10 @@ msgstr "" msgid "No image" msgstr "" -#: include/views/configuration.host.discovery.edit.php:382 -#: include/views/configuration.item.edit.php:474 -#: include/views/configuration.item.massupdate.php:78 -#: include/views/configuration.item.prototype.edit.php:461 +#: include/views/configuration.host.discovery.edit.php:368 +#: include/views/configuration.item.edit.php:459 +#: include/views/configuration.item.massupdate.php:77 +#: include/views/configuration.item.prototype.edit.php:444 #: include/views/configuration.item.prototype.massupdate.php:74 #: jsLoader.php:269 msgid "No interface found" @@ -11231,8 +11247,8 @@ msgstr "" msgid "No interface provided for proxy \"%s\"." msgstr "" -#: include/classes/api/services/CHost.php:1690 -#: include/classes/api/services/CHost.php:1866 +#: include/classes/api/services/CHost.php:1726 +#: include/classes/api/services/CHost.php:1902 #, c-format msgid "No interfaces for host \"%s\"." msgstr "" @@ -11295,8 +11311,8 @@ msgstr "" #: app/controllers/CControllerWidgetDiscoveryView.php:64 #: app/controllers/CControllerWidgetMapView.php:68 #: app/controllers/CControllerWidgetPlainTextView.php:78 -#: app/views/monitoring.widget.graph.view.php:23 disc_prototypes.php:1171 -#: disc_prototypes.php:1385 include/classes/api/services/CAction.php:1541 +#: app/views/monitoring.widget.graph.view.php:23 disc_prototypes.php:1184 +#: disc_prototypes.php:1408 include/classes/api/services/CAction.php:1541 #: include/classes/api/services/CAction.php:1890 #: include/classes/api/services/CAction.php:2878 #: include/classes/api/services/CApplication.php:304 @@ -11311,9 +11327,10 @@ msgstr "" #: include/classes/api/services/CDashboard.php:368 #: include/classes/api/services/CDashboard.php:393 #: include/classes/api/services/CDashboard.php:1233 -#: include/classes/api/services/CDiscoveryRule.php:481 -#: include/classes/api/services/CDiscoveryRule.php:582 -#: include/classes/api/services/CDiscoveryRule.php:618 +#: include/classes/api/services/CDiscoveryRule.php:496 +#: include/classes/api/services/CDiscoveryRule.php:597 +#: include/classes/api/services/CDiscoveryRule.php:633 +#: include/classes/api/services/CDiscoveryRule.php:1474 #: include/classes/api/services/CDRule.php:183 #: include/classes/api/services/CDRule.php:309 #: include/classes/api/services/CDRule.php:336 @@ -11330,21 +11347,21 @@ msgstr "" #: include/classes/api/services/CGraphPrototype.php:717 #: include/classes/api/services/CHostBase.php:49 #: include/classes/api/services/CHostGeneral.php:56 -#: include/classes/api/services/CHostGroup.php:532 -#: include/classes/api/services/CHostGroup.php:788 -#: include/classes/api/services/CHostGroup.php:1027 -#: include/classes/api/services/CHostGroup.php:1058 -#: include/classes/api/services/CHostGroup.php:1159 -#: include/classes/api/services/CHostGroup.php:1281 -#: include/classes/api/services/CHostGroup.php:1301 +#: include/classes/api/services/CHostGroup.php:696 +#: include/classes/api/services/CHostGroup.php:805 +#: include/classes/api/services/CHostGroup.php:1044 +#: include/classes/api/services/CHostGroup.php:1075 +#: include/classes/api/services/CHostGroup.php:1176 +#: include/classes/api/services/CHostGroup.php:1298 +#: include/classes/api/services/CHostGroup.php:1318 #: include/classes/api/services/CHostInterface.php:239 #: include/classes/api/services/CHostInterface.php:259 #: include/classes/api/services/CHostInterface.php:394 #: include/classes/api/services/CHostInterface.php:653 #: include/classes/api/services/CHost.php:1122 #: include/classes/api/services/CHost.php:1157 -#: include/classes/api/services/CHost.php:1666 -#: include/classes/api/services/CHost.php:1798 +#: include/classes/api/services/CHost.php:1702 +#: include/classes/api/services/CHost.php:1834 #: include/classes/api/services/CHostPrototype.php:353 #: include/classes/api/services/CHostPrototype.php:399 #: include/classes/api/services/CHostPrototype.php:420 @@ -11364,8 +11381,8 @@ msgstr "" #: include/classes/api/services/CItemGeneral.php:209 #: include/classes/api/services/CItemGeneral.php:311 #: include/classes/api/services/CItemGeneral.php:326 -#: include/classes/api/services/CItem.php:699 -#: include/classes/api/services/CItemPrototype.php:869 +#: include/classes/api/services/CItem.php:712 +#: include/classes/api/services/CItemPrototype.php:883 #: include/classes/api/services/CMaintenance.php:263 #: include/classes/api/services/CMaintenance.php:292 #: include/classes/api/services/CMaintenance.php:305 @@ -11424,7 +11441,7 @@ msgstr "" #: include/classes/helpers/CMapHelper.php:83 #: include/classes/screens/CScreenHistory.php:139 #: include/classes/screens/CScreenHttpTestDetails.php:46 -#: include/func.inc.php:1758 items.php:1489 items.php:1673 +#: include/func.inc.php:1758 items.php:1490 items.php:1684 msgid "No permissions to referred object or it does not exist!" msgstr "" @@ -11474,7 +11491,7 @@ msgstr "" msgid "No target selected" msgstr "" -#: graphs.php:372 items.php:1354 +#: graphs.php:372 items.php:1355 msgid "No target selected." msgstr "" @@ -11487,7 +11504,7 @@ msgstr "" msgid "No triggers defined." msgstr "" -#: include/classes/validators/CApiInputValidator.php:618 +#: include/classes/validators/CApiInputValidator.php:622 msgid "Non-boolean flags are deprecated." msgstr "" @@ -11508,17 +11525,17 @@ msgstr "" #: include/views/administration.general.other.edit.php:42 #: include/views/administration.usergroups.edit.php:126 #: include/views/administration.usergroups.edit.php:158 -#: include/views/configuration.host.discovery.edit.php:284 +#: include/views/configuration.host.discovery.edit.php:275 #: include/views/configuration.host.list.php:275 #: include/views/configuration.host.list.php:281 #: include/views/configuration.host.list.php:293 #: include/views/configuration.host.list.php:296 -#: include/views/configuration.item.edit.php:325 -#: include/views/configuration.item.edit.php:881 -#: include/views/configuration.item.edit.php:895 -#: include/views/configuration.item.prototype.edit.php:313 -#: include/views/configuration.item.prototype.edit.php:732 -#: include/views/configuration.item.prototype.edit.php:747 +#: include/views/configuration.item.edit.php:318 +#: include/views/configuration.item.edit.php:866 +#: include/views/configuration.item.edit.php:880 +#: include/views/configuration.item.prototype.edit.php:303 +#: include/views/configuration.item.prototype.edit.php:721 +#: include/views/configuration.item.prototype.edit.php:736 #: include/views/configuration.trigger.prototype.edit.php:274 #: include/views/configuration.triggers.edit.php:298 #: include/views/js/monitoring.sysmaps.js.php:3 @@ -11612,7 +11629,7 @@ msgstr "" msgid "Nov" msgstr "" -#: include/forms.inc.php:1991 include/func.inc.php:126 +#: include/forms.inc.php:2239 include/func.inc.php:126 #: include/func.inc.php:263 jsLoader.php:143 msgid "November" msgstr "" @@ -11754,14 +11771,15 @@ msgstr "" msgid "Number or percentage of inodes. Returns integer for number; float for percentage" msgstr "" -#: include/items.inc.php:1755 +#: include/items.inc.php:1748 include/items.inc.php:1752 +#: include/items.inc.php:1756 msgid "Numeral systems" msgstr "" #: include/forms.inc.php:352 include/items.inc.php:129 -#: include/triggers.inc.php:1862 include/views/configuration.item.edit.php:677 -#: include/views/configuration.item.massupdate.php:278 -#: include/views/configuration.item.prototype.edit.php:606 +#: include/triggers.inc.php:1862 include/views/configuration.item.edit.php:664 +#: include/views/configuration.item.massupdate.php:266 +#: include/views/configuration.item.prototype.edit.php:593 #: include/views/configuration.item.prototype.massupdate.php:261 msgid "Numeric (float)" msgstr "" @@ -11771,9 +11789,9 @@ msgid "Numeric (integer)" msgstr "" #: include/forms.inc.php:351 include/items.inc.php:127 -#: include/views/configuration.item.edit.php:676 -#: include/views/configuration.item.massupdate.php:277 -#: include/views/configuration.item.prototype.edit.php:605 +#: include/views/configuration.item.edit.php:663 +#: include/views/configuration.item.massupdate.php:265 +#: include/views/configuration.item.prototype.edit.php:592 #: include/views/configuration.item.prototype.massupdate.php:260 msgid "Numeric (unsigned)" msgstr "" @@ -11835,11 +11853,11 @@ msgstr "" msgid "Oct" msgstr "" -#: include/items.inc.php:1758 +#: include/items.inc.php:1753 msgid "Octal to decimal" msgstr "" -#: include/forms.inc.php:1983 include/func.inc.php:125 +#: include/forms.inc.php:2231 include/func.inc.php:125 #: include/func.inc.php:262 jsLoader.php:142 msgid "October" msgstr "" @@ -11856,7 +11874,7 @@ msgstr "" #: include/classes/html/CTriggersInfo.php:76 #: include/views/administration.users.list.php:124 #: include/views/configuration.triggers.list.php:58 -#: include/views/js/common.item.edit.js.php:736 +#: include/views/js/common.item.edit.js.php:327 #: include/views/js/configuration.httpconf.edit.js.php:584 #: include/views/js/configuration.httpconf.edit.js.php:658 #: include/views/js/conf.import.js.php:24 report2.php:431 @@ -11891,11 +11909,11 @@ msgstr "" msgid "One" msgstr "" -#: include/classes/api/services/CHostGroup.php:1169 +#: include/classes/api/services/CHostGroup.php:1186 msgid "One of the objects is left without a host group." msgstr "" -#: include/forms.inc.php:1874 include/maintenances.inc.php:31 +#: include/forms.inc.php:2122 include/maintenances.inc.php:31 msgid "One time only" msgstr "" @@ -11904,7 +11922,7 @@ msgstr "" msgid "One-time downtime" msgstr "" -#: include/classes/api/services/CHostGroup.php:743 +#: include/classes/api/services/CHostGroup.php:655 msgid "Only Super Admins can create host groups." msgstr "" @@ -11954,7 +11972,7 @@ msgstr "" msgid "Only items assigned to enabled hosts are counted" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1369 +#: include/classes/api/services/CItemGeneral.php:1459 msgid "Only one change step is allowed." msgstr "" @@ -11962,8 +11980,8 @@ msgstr "" msgid "Only one check can be unique." msgstr "" -#: include/classes/api/services/CItemGeneral.php:1346 -#: include/classes/api/services/CItemGeneral.php:1391 +#: include/classes/api/services/CItemGeneral.php:1436 +#: include/classes/api/services/CItemGeneral.php:1481 msgid "Only one throttling step is allowed." msgstr "" @@ -12076,7 +12094,7 @@ msgstr "" #: include/views/configuration.action.edit.php:113 #: include/views/configuration.action.edit.php:1151 #: include/views/configuration.correlation.edit.php:95 -#: include/views/configuration.host.discovery.edit.php:599 +#: include/views/configuration.host.discovery.edit.php:587 #: include/views/configuration.maintenance.edit.php:171 #: include/views/configuration.trigger.prototype.edit.php:137 #: include/views/configuration.trigger.prototype.edit.php:329 @@ -12100,41 +12118,41 @@ msgstr "" #: include/views/configuration.host.massupdate.php:268 #: include/views/configuration.host.massupdate.php:309 #: include/views/configuration.host.massupdate.php:348 -#: include/views/configuration.item.massupdate.php:41 -#: include/views/configuration.item.massupdate.php:84 +#: include/views/configuration.item.massupdate.php:40 +#: include/views/configuration.item.massupdate.php:83 #: include/views/configuration.item.massupdate.php:96 -#: include/views/configuration.item.massupdate.php:104 -#: include/views/configuration.item.massupdate.php:113 -#: include/views/configuration.item.massupdate.php:127 -#: include/views/configuration.item.massupdate.php:148 -#: include/views/configuration.item.massupdate.php:184 -#: include/views/configuration.item.massupdate.php:192 -#: include/views/configuration.item.massupdate.php:200 -#: include/views/configuration.item.massupdate.php:208 -#: include/views/configuration.item.massupdate.php:220 +#: include/views/configuration.item.massupdate.php:103 +#: include/views/configuration.item.massupdate.php:111 +#: include/views/configuration.item.massupdate.php:124 +#: include/views/configuration.item.massupdate.php:146 +#: include/views/configuration.item.massupdate.php:181 +#: include/views/configuration.item.massupdate.php:188 +#: include/views/configuration.item.massupdate.php:195 +#: include/views/configuration.item.massupdate.php:202 +#: include/views/configuration.item.massupdate.php:213 +#: include/views/configuration.item.massupdate.php:225 #: include/views/configuration.item.massupdate.php:233 -#: include/views/configuration.item.massupdate.php:242 -#: include/views/configuration.item.massupdate.php:256 -#: include/views/configuration.item.massupdate.php:265 -#: include/views/configuration.item.massupdate.php:273 -#: include/views/configuration.item.massupdate.php:287 -#: include/views/configuration.item.massupdate.php:295 -#: include/views/configuration.item.massupdate.php:306 -#: include/views/configuration.item.massupdate.php:314 -#: include/views/configuration.item.massupdate.php:322 -#: include/views/configuration.item.massupdate.php:330 -#: include/views/configuration.item.massupdate.php:437 -#: include/views/configuration.item.massupdate.php:509 +#: include/views/configuration.item.massupdate.php:246 +#: include/views/configuration.item.massupdate.php:254 +#: include/views/configuration.item.massupdate.php:261 +#: include/views/configuration.item.massupdate.php:274 +#: include/views/configuration.item.massupdate.php:281 +#: include/views/configuration.item.massupdate.php:291 +#: include/views/configuration.item.massupdate.php:298 +#: include/views/configuration.item.massupdate.php:305 +#: include/views/configuration.item.massupdate.php:312 +#: include/views/configuration.item.massupdate.php:319 +#: include/views/configuration.item.massupdate.php:392 +#: include/views/configuration.item.massupdate.php:399 +#: include/views/configuration.item.massupdate.php:406 +#: include/views/configuration.item.massupdate.php:419 +#: include/views/configuration.item.massupdate.php:426 +#: include/views/configuration.item.massupdate.php:441 +#: include/views/configuration.item.massupdate.php:449 +#: include/views/configuration.item.massupdate.php:456 #: include/views/configuration.item.massupdate.php:517 -#: include/views/configuration.item.massupdate.php:523 -#: include/views/configuration.item.massupdate.php:535 -#: include/views/configuration.item.massupdate.php:543 -#: include/views/configuration.item.massupdate.php:560 -#: include/views/configuration.item.massupdate.php:567 -#: include/views/configuration.item.massupdate.php:574 -#: include/views/configuration.item.massupdate.php:635 -#: include/views/configuration.item.massupdate.php:675 -#: include/views/configuration.item.massupdate.php:684 +#: include/views/configuration.item.massupdate.php:557 +#: include/views/configuration.item.massupdate.php:566 #: include/views/configuration.item.prototype.massupdate.php:36 #: include/views/configuration.item.prototype.massupdate.php:79 #: include/views/configuration.item.prototype.massupdate.php:92 @@ -12158,19 +12176,19 @@ msgstr "" #: include/views/configuration.item.prototype.massupdate.php:293 #: include/views/configuration.item.prototype.massupdate.php:300 #: include/views/configuration.item.prototype.massupdate.php:307 -#: include/views/configuration.item.prototype.massupdate.php:414 -#: include/views/configuration.item.prototype.massupdate.php:488 -#: include/views/configuration.item.prototype.massupdate.php:495 -#: include/views/configuration.item.prototype.massupdate.php:502 -#: include/views/configuration.item.prototype.massupdate.php:517 -#: include/views/configuration.item.prototype.massupdate.php:524 -#: include/views/configuration.item.prototype.massupdate.php:540 -#: include/views/configuration.item.prototype.massupdate.php:548 -#: include/views/configuration.item.prototype.massupdate.php:555 -#: include/views/configuration.item.prototype.massupdate.php:561 -#: include/views/configuration.item.prototype.massupdate.php:636 -#: include/views/configuration.item.prototype.massupdate.php:668 -#: include/views/configuration.item.prototype.massupdate.php:678 +#: include/views/configuration.item.prototype.massupdate.php:314 +#: include/views/configuration.item.prototype.massupdate.php:388 +#: include/views/configuration.item.prototype.massupdate.php:395 +#: include/views/configuration.item.prototype.massupdate.php:402 +#: include/views/configuration.item.prototype.massupdate.php:417 +#: include/views/configuration.item.prototype.massupdate.php:424 +#: include/views/configuration.item.prototype.massupdate.php:440 +#: include/views/configuration.item.prototype.massupdate.php:448 +#: include/views/configuration.item.prototype.massupdate.php:455 +#: include/views/configuration.item.prototype.massupdate.php:461 +#: include/views/configuration.item.prototype.massupdate.php:536 +#: include/views/configuration.item.prototype.massupdate.php:568 +#: include/views/configuration.item.prototype.massupdate.php:578 #: include/views/configuration.trigger.prototype.massupdate.php:41 #: include/views/configuration.trigger.prototype.massupdate.php:131 #: include/views/configuration.trigger.prototype.massupdate.php:163 @@ -12204,8 +12222,8 @@ msgstr "" msgid "Outgoing traffic statistics on network interface. Returns integer" msgstr "" -#: include/views/configuration.item.edit.php:769 -#: include/views/configuration.item.edit.php:795 +#: include/views/configuration.item.edit.php:756 +#: include/views/configuration.item.edit.php:782 msgctxt "item_form" msgid "Overridden by" msgstr "" @@ -12454,20 +12472,16 @@ msgstr "" msgid "Parameter" msgstr "" -#: include/classes/validators/CApiInputValidator.php:678 +#: include/classes/validators/CApiInputValidator.php:682 #, c-format msgid "Parameter \"%1$s\" is deprecated." msgstr "" -#: include/classes/debug/CProfiler.php:182 -#: include/views/configuration.item.edit.php:936 -#: include/views/configuration.item.massupdate.php:342 -#: include/views/configuration.item.prototype.edit.php:769 -#: include/views/configuration.item.prototype.massupdate.php:319 +#: include/classes/debug/CProfiler.php:182 include/forms.inc.php:1397 msgid "Parameters" msgstr "" -#: include/views/configuration.host.discovery.edit.php:42 +#: include/views/configuration.host.discovery.edit.php:40 #: include/views/configuration.host.prototype.edit.php:52 msgid "Parent discovery rules" msgstr "" @@ -12477,7 +12491,7 @@ msgid "Parent graphs" msgstr "" #: include/views/configuration.item.edit.php:44 -#: include/views/configuration.item.prototype.edit.php:42 +#: include/views/configuration.item.prototype.edit.php:40 msgid "Parent items" msgstr "" @@ -12495,9 +12509,9 @@ msgid "Parent web scenarios" msgstr "" #: app/views/popup.httpstep.php:56 -#: include/views/configuration.host.discovery.edit.php:82 -#: include/views/configuration.item.edit.php:114 -#: include/views/configuration.item.prototype.edit.php:103 +#: include/views/configuration.host.discovery.edit.php:80 +#: include/views/configuration.item.edit.php:115 +#: include/views/configuration.item.prototype.edit.php:101 msgid "Parse" msgstr "" @@ -12517,7 +12531,7 @@ msgid "Passive" msgstr "" #: app/views/administration.mediatype.edit.php:164 disc_prototypes.php:266 -#: host_discovery.php:207 httpconf.php:58 +#: host_discovery.php:208 httpconf.php:58 #: include/classes/setup/CSetupWizard.php:248 #: include/views/administration.users.edit.php:109 #: include/views/administration.users.edit.php:140 @@ -12527,24 +12541,24 @@ msgstr "" #: include/views/configuration.action.edit.php:1762 #: include/views/configuration.action.edit.php:2197 #: include/views/configuration.action.edit.php:2224 -#: include/views/configuration.host.discovery.edit.php:303 -#: include/views/configuration.host.discovery.edit.php:461 -#: include/views/configuration.host.discovery.edit.php:489 +#: include/views/configuration.host.discovery.edit.php:292 +#: include/views/configuration.host.discovery.edit.php:449 +#: include/views/configuration.host.discovery.edit.php:478 #: include/views/configuration.host.edit.php:670 #: include/views/configuration.host.prototype.edit.php:338 #: include/views/configuration.httpconf.edit.php:164 -#: include/views/configuration.item.edit.php:344 -#: include/views/configuration.item.edit.php:600 -#: include/views/configuration.item.edit.php:636 -#: include/views/configuration.item.massupdate.php:299 -#: include/views/configuration.item.massupdate.php:331 -#: include/views/configuration.item.prototype.edit.php:332 -#: include/views/configuration.item.prototype.edit.php:540 -#: include/views/configuration.item.prototype.edit.php:568 +#: include/views/configuration.item.edit.php:335 +#: include/views/configuration.item.edit.php:586 +#: include/views/configuration.item.edit.php:623 +#: include/views/configuration.item.massupdate.php:285 +#: include/views/configuration.item.massupdate.php:313 +#: include/views/configuration.item.prototype.edit.php:320 +#: include/views/configuration.item.prototype.edit.php:526 +#: include/views/configuration.item.prototype.edit.php:555 #: include/views/configuration.item.prototype.massupdate.php:280 #: include/views/configuration.item.prototype.massupdate.php:308 #: include/views/general.login.php:64 -#: include/views/js/common.item.edit.js.php:521 items.php:263 +#: include/views/js/common.item.edit.js.php:251 items.php:263 msgid "Password" msgstr "" @@ -12595,17 +12609,17 @@ msgid "Performs a DNS query. Returns character string with the required type of msgstr "" #: app/views/report.services.php:31 -#: include/views/configuration.host.discovery.edit.php:518 -#: include/views/configuration.item.edit.php:700 -#: include/views/configuration.item.massupdate.php:457 -#: include/views/configuration.item.prototype.edit.php:629 -#: include/views/configuration.item.prototype.massupdate.php:435 +#: include/views/configuration.host.discovery.edit.php:506 +#: include/views/configuration.item.edit.php:687 +#: include/views/configuration.item.massupdate.php:339 +#: include/views/configuration.item.prototype.edit.php:616 +#: include/views/configuration.item.prototype.massupdate.php:335 #: include/views/configuration.maintenance.edit.php:77 report4.php:104 #: srv_status.php:170 msgid "Period" msgstr "" -#: include/forms.inc.php:1872 +#: include/forms.inc.php:2120 #: include/views/configuration.maintenance.edit.php:77 #: include/views/configuration.services.edit.php:226 msgid "Period type" @@ -12712,24 +12726,24 @@ msgstr "" msgid "Polish (pl_PL)" msgstr "" -#: include/views/configuration.item.edit.php:915 +#: include/views/configuration.item.edit.php:900 msgid "Populates host inventory field" msgstr "" -#: app/views/administration.authentication.edit.php:88 +#: app/views/administration.authentication.edit.php:92 #: app/views/administration.proxy.edit.php:43 disc_prototypes.php:121 #: host_discovery.php:105 include/classes/setup/CSetupWizard.php:279 #: include/forms.inc.php:472 include/views/configuration.action.edit.php:995 #: include/views/configuration.action.edit.php:1777 #: include/views/configuration.action.edit.php:2236 -#: include/views/configuration.host.discovery.edit.php:448 +#: include/views/configuration.host.discovery.edit.php:436 #: include/views/configuration.host.edit.php:111 #: include/views/configuration.host.edit.php:194 #: include/views/configuration.host.list.php:113 #: include/views/configuration.host.prototype.edit.php:86 -#: include/views/configuration.item.edit.php:586 -#: include/views/configuration.item.massupdate.php:266 -#: include/views/configuration.item.prototype.edit.php:527 +#: include/views/configuration.item.edit.php:572 +#: include/views/configuration.item.massupdate.php:255 +#: include/views/configuration.item.prototype.edit.php:513 #: include/views/configuration.item.prototype.massupdate.php:250 #: include/views/inventory.host.view.php:72 items.php:131 items.php:304 #: setup.php:50 @@ -12769,15 +12783,17 @@ msgstr "" msgid "Pre-installation summary" msgstr "" -#: include/views/configuration.item.edit.php:1161 -#: include/views/configuration.item.prototype.edit.php:994 +#: include/views/configuration.host.discovery.edit.php:742 +#: include/views/configuration.item.edit.php:918 +#: include/views/configuration.item.prototype.edit.php:754 msgid "Preprocessing" msgstr "" -#: include/views/configuration.item.edit.php:1156 -#: include/views/configuration.item.massupdate.php:438 -#: include/views/configuration.item.prototype.edit.php:989 -#: include/views/configuration.item.prototype.massupdate.php:415 +#: include/views/configuration.host.discovery.edit.php:744 +#: include/views/configuration.item.edit.php:920 +#: include/views/configuration.item.massupdate.php:320 +#: include/views/configuration.item.prototype.edit.php:756 +#: include/views/configuration.item.prototype.massupdate.php:315 msgid "Preprocessing steps" msgstr "" @@ -12828,19 +12844,19 @@ msgstr "" msgid "Primary POC screen name" msgstr "" -#: include/views/configuration.host.discovery.edit.php:443 -#: include/views/configuration.item.edit.php:581 -#: include/views/configuration.item.massupdate.php:257 -#: include/views/configuration.item.prototype.edit.php:522 +#: include/views/configuration.host.discovery.edit.php:431 +#: include/views/configuration.item.edit.php:567 +#: include/views/configuration.item.massupdate.php:247 +#: include/views/configuration.item.prototype.edit.php:508 #: include/views/configuration.item.prototype.massupdate.php:242 #: include/views/js/configuration.discovery.edit.js.php:118 msgid "Privacy passphrase" msgstr "" -#: include/views/configuration.host.discovery.edit.php:436 -#: include/views/configuration.item.edit.php:575 -#: include/views/configuration.item.massupdate.php:243 -#: include/views/configuration.item.prototype.edit.php:515 +#: include/views/configuration.host.discovery.edit.php:424 +#: include/views/configuration.item.edit.php:562 +#: include/views/configuration.item.massupdate.php:234 +#: include/views/configuration.item.prototype.edit.php:501 #: include/views/configuration.item.prototype.massupdate.php:230 #: include/views/js/configuration.discovery.edit.js.php:110 msgid "Privacy protocol" @@ -12856,10 +12872,10 @@ msgstr "" #: include/views/configuration.action.edit.php:974 #: include/views/configuration.action.edit.php:1754 #: include/views/configuration.action.edit.php:2217 -#: include/views/configuration.host.discovery.edit.php:483 -#: include/views/configuration.item.edit.php:630 -#: include/views/configuration.item.massupdate.php:323 -#: include/views/configuration.item.prototype.edit.php:562 +#: include/views/configuration.host.discovery.edit.php:472 +#: include/views/configuration.item.edit.php:617 +#: include/views/configuration.item.massupdate.php:306 +#: include/views/configuration.item.prototype.edit.php:549 #: include/views/configuration.item.prototype.massupdate.php:301 msgid "Private key file" msgstr "" @@ -13056,10 +13072,10 @@ msgstr "" #: include/views/configuration.action.edit.php:953 #: include/views/configuration.action.edit.php:1731 #: include/views/configuration.action.edit.php:2198 -#: include/views/configuration.host.discovery.edit.php:462 -#: include/views/configuration.item.edit.php:601 -#: include/views/configuration.item.massupdate.php:300 -#: include/views/configuration.item.prototype.edit.php:541 +#: include/views/configuration.host.discovery.edit.php:450 +#: include/views/configuration.item.edit.php:587 +#: include/views/configuration.item.massupdate.php:286 +#: include/views/configuration.item.prototype.edit.php:527 #: include/views/configuration.item.prototype.massupdate.php:281 msgid "Public key" msgstr "" @@ -13067,18 +13083,18 @@ msgstr "" #: include/views/configuration.action.edit.php:966 #: include/views/configuration.action.edit.php:1745 #: include/views/configuration.action.edit.php:2209 -#: include/views/configuration.host.discovery.edit.php:476 -#: include/views/configuration.item.edit.php:623 -#: include/views/configuration.item.massupdate.php:315 -#: include/views/configuration.item.prototype.edit.php:555 +#: include/views/configuration.host.discovery.edit.php:465 +#: include/views/configuration.item.edit.php:610 +#: include/views/configuration.item.massupdate.php:299 +#: include/views/configuration.item.prototype.edit.php:542 #: include/views/configuration.item.prototype.massupdate.php:294 msgid "Public key file" msgstr "" #: app/views/popup.httpstep.php:65 -#: include/views/configuration.host.discovery.edit.php:106 -#: include/views/configuration.item.edit.php:138 -#: include/views/configuration.item.prototype.edit.php:126 +#: include/views/configuration.host.discovery.edit.php:105 +#: include/views/configuration.item.edit.php:140 +#: include/views/configuration.item.prototype.edit.php:125 msgid "Query fields" msgstr "" @@ -13104,10 +13120,10 @@ msgid "RMCP+" msgstr "" #: app/views/popup.httpstep.php:76 -#: include/views/configuration.host.discovery.edit.php:171 -#: include/views/configuration.item.edit.php:203 -#: include/views/configuration.item.massupdate.php:118 -#: include/views/configuration.item.prototype.edit.php:191 +#: include/views/configuration.host.discovery.edit.php:167 +#: include/views/configuration.item.edit.php:202 +#: include/views/configuration.item.massupdate.php:116 +#: include/views/configuration.item.prototype.edit.php:187 #: include/views/configuration.item.prototype.massupdate.php:112 msgid "Raw data" msgstr "" @@ -13201,8 +13217,8 @@ msgstr "" msgid "Recovery expression" msgstr "" -#: include/forms.inc.php:1690 include/forms.inc.php:1695 -#: include/forms.inc.php:1703 +#: include/forms.inc.php:1938 include/forms.inc.php:1943 +#: include/forms.inc.php:1951 msgid "Recovery expression syntax error." msgstr "" @@ -13250,8 +13266,8 @@ msgstr "" msgid "Regular" msgstr "" -#: include/audit.inc.php:49 include/items.inc.php:1728 -#: include/views/configuration.host.discovery.edit.php:617 +#: include/audit.inc.php:49 include/items.inc.php:1713 +#: include/views/configuration.host.discovery.edit.php:605 msgid "Regular expression" msgstr "" @@ -13312,7 +13328,7 @@ msgstr "" #: app/views/popup.triggerwizard.js.php:335 #: app/views/popup.triggerwizard.php:57 app/views/popup.triggerwizard.php:101 #: include/classes/widgets/CWidgetHelper.php:408 -#: include/classes/widgets/CWidgetHelper.php:452 +#: include/classes/widgets/CWidgetHelper.php:452 include/forms.inc.php:1593 #: include/views/administration.general.iconmap.edit.php:84 #: include/views/administration.general.macros.edit.php:56 #: include/views/administration.general.regularexpressions.edit.php:77 @@ -13328,28 +13344,25 @@ msgstr "" #: include/views/configuration.action.edit.php:1916 #: include/views/configuration.correlation.edit.php:76 #: include/views/configuration.correlation.edit.php:230 -#: include/views/configuration.host.discovery.edit.php:131 -#: include/views/configuration.host.discovery.edit.php:226 -#: include/views/configuration.host.discovery.edit.php:547 -#: include/views/configuration.host.discovery.edit.php:660 +#: include/views/configuration.host.discovery.edit.php:130 +#: include/views/configuration.host.discovery.edit.php:222 +#: include/views/configuration.host.discovery.edit.php:535 +#: include/views/configuration.host.discovery.edit.php:648 +#: include/views/configuration.host.discovery.edit.php:717 #: include/views/configuration.httpconf.edit.php:243 -#: include/views/configuration.item.edit.php:163 -#: include/views/configuration.item.edit.php:258 -#: include/views/configuration.item.edit.php:741 -#: include/views/configuration.item.edit.php:1129 -#: include/views/configuration.item.massupdate.php:170 -#: include/views/configuration.item.massupdate.php:421 -#: include/views/configuration.item.massupdate.php:489 -#: include/views/configuration.item.massupdate.php:612 -#: include/views/configuration.item.prototype.edit.php:151 -#: include/views/configuration.item.prototype.edit.php:246 -#: include/views/configuration.item.prototype.edit.php:658 -#: include/views/configuration.item.prototype.edit.php:962 +#: include/views/configuration.item.edit.php:165 +#: include/views/configuration.item.edit.php:257 +#: include/views/configuration.item.edit.php:728 +#: include/views/configuration.item.massupdate.php:168 +#: include/views/configuration.item.massupdate.php:371 +#: include/views/configuration.item.massupdate.php:494 +#: include/views/configuration.item.prototype.edit.php:150 +#: include/views/configuration.item.prototype.edit.php:242 +#: include/views/configuration.item.prototype.edit.php:645 #: include/views/configuration.item.prototype.massupdate.php:164 -#: include/views/configuration.item.prototype.massupdate.php:398 -#: include/views/configuration.item.prototype.massupdate.php:467 -#: include/views/configuration.item.prototype.massupdate.php:568 -#: include/views/configuration.item.prototype.massupdate.php:643 +#: include/views/configuration.item.prototype.massupdate.php:367 +#: include/views/configuration.item.prototype.massupdate.php:468 +#: include/views/configuration.item.prototype.massupdate.php:543 #: include/views/configuration.maintenance.edit.php:95 #: include/views/configuration.maintenance.edit.php:193 #: include/views/configuration.maintenance.edit.php:213 @@ -13376,24 +13389,24 @@ msgstr "" #: include/views/js/adm.regexprs.edit.js.php:12 #: include/views/js/common.filter.trigger.js.php:14 #: include/views/js/common.item.edit.js.php:22 -#: include/views/js/common.item.edit.js.php:64 #: include/views/js/configuration.action.edit.js.php:9 #: include/views/js/configuration.action.edit.js.php:21 #: include/views/js/configuration.action.edit.js.php:35 #: include/views/js/configuration.action.edit.js.php:49 #: include/views/js/configuration.discovery.edit.js.php:10 #: include/views/js/configuration.graph.edit.js.php:93 -#: include/views/js/configuration.host.discovery.edit.js.php:31 +#: include/views/js/configuration.host.discovery.edit.js.php:33 +#: include/views/js/configuration.host.discovery.edit.js.php:53 #: include/views/js/configuration.host.edit.js.php:47 #: include/views/js/configuration.host.prototype.edit.js.php:7 #: include/views/js/configuration.httpconf.edit.js.php:21 -#: include/views/js/configuration.item.massupdate.js.php:22 -#: include/views/js/configuration.item.massupdate.js.php:47 +#: include/views/js/configuration.item.massupdate.js.php:26 #: include/views/js/configuration.maintenance.edit.js.php:14 #: include/views/js/configuration.services.edit.js.php:81 #: include/views/js/configuration.triggers.edit.js.php:11 #: include/views/js/configuration.triggers.list.js.php:14 #: include/views/js/hostmacros.js.php:14 include/views/js/hostmacros.js.php:46 +#: include/views/js/item.preprocessing.js.php:32 #: include/views/js/monitoring.screen.edit.js.php:24 #: include/views/js/monitoring.screen.edit.js.php:58 #: include/views/js/monitoring.slideconf.edit.js.php:16 @@ -13419,7 +13432,7 @@ msgstr "" msgid "Remove" msgstr "" -#: app/views/administration.authentication.edit.php:47 +#: app/views/administration.authentication.edit.php:48 msgid "Remove domain name" msgstr "" @@ -13458,9 +13471,9 @@ msgid "Removed, %1$s" msgstr "" #: include/views/configuration.host.massupdate.php:214 -#: include/views/configuration.item.massupdate.php:611 -#: include/views/configuration.item.prototype.massupdate.php:567 -#: include/views/configuration.item.prototype.massupdate.php:642 +#: include/views/configuration.item.massupdate.php:493 +#: include/views/configuration.item.prototype.massupdate.php:467 +#: include/views/configuration.item.prototype.massupdate.php:542 #: include/views/configuration.trigger.prototype.edit.php:144 #: include/views/configuration.trigger.prototype.edit.php:336 #: include/views/configuration.triggers.edit.php:165 @@ -13486,29 +13499,29 @@ msgstr "" msgid "Reports" msgstr "" -#: include/views/configuration.host.discovery.edit.php:181 -#: include/views/configuration.item.edit.php:213 -#: include/views/configuration.item.massupdate.php:128 -#: include/views/configuration.item.prototype.edit.php:201 +#: include/views/configuration.host.discovery.edit.php:176 +#: include/views/configuration.item.edit.php:211 +#: include/views/configuration.item.massupdate.php:125 +#: include/views/configuration.item.prototype.edit.php:196 #: include/views/configuration.item.prototype.massupdate.php:121 msgid "Request body" msgstr "" -#: include/views/configuration.host.discovery.edit.php:169 -#: include/views/configuration.item.edit.php:201 -#: include/views/configuration.item.massupdate.php:114 -#: include/views/configuration.item.prototype.edit.php:189 +#: include/views/configuration.host.discovery.edit.php:165 +#: include/views/configuration.item.edit.php:200 +#: include/views/configuration.item.massupdate.php:112 +#: include/views/configuration.item.prototype.edit.php:185 #: include/views/configuration.item.prototype.massupdate.php:108 msgid "Request body type" msgstr "" -#: host_discovery.php:284 host_discovery.php:529 items.php:967 items.php:1416 +#: host_discovery.php:288 host_discovery.php:608 items.php:967 items.php:1417 msgid "Request sent successfully" msgstr "" -#: include/views/configuration.host.discovery.edit.php:147 -#: include/views/configuration.item.edit.php:179 -#: include/views/configuration.item.prototype.edit.php:167 +#: include/views/configuration.host.discovery.edit.php:145 +#: include/views/configuration.item.edit.php:180 +#: include/views/configuration.item.prototype.edit.php:165 msgid "Request type" msgstr "" @@ -13534,9 +13547,9 @@ msgid "Required server performance, new values per second" msgstr "" #: app/views/popup.httpstep.php:155 -#: include/views/configuration.host.discovery.edit.php:242 -#: include/views/configuration.item.edit.php:274 -#: include/views/configuration.item.prototype.edit.php:262 +#: include/views/configuration.host.discovery.edit.php:237 +#: include/views/configuration.item.edit.php:272 +#: include/views/configuration.item.prototype.edit.php:257 msgid "Required status codes" msgstr "" @@ -13640,9 +13653,9 @@ msgid "Result type" msgstr "" #: app/views/popup.httpstep.php:140 -#: include/views/configuration.host.discovery.edit.php:259 -#: include/views/configuration.item.edit.php:291 -#: include/views/configuration.item.prototype.edit.php:279 +#: include/views/configuration.host.discovery.edit.php:252 +#: include/views/configuration.item.edit.php:287 +#: include/views/configuration.item.prototype.edit.php:272 msgid "Retrieve mode" msgstr "" @@ -13707,7 +13720,7 @@ msgstr "" msgid "Right Y" msgstr "" -#: include/items.inc.php:1730 +#: include/items.inc.php:1721 msgid "Right trim" msgstr "" @@ -13796,11 +13809,11 @@ msgctxt "Sunday short" msgid "S" msgstr "" -#: include/views/configuration.host.discovery.edit.php:427 -#: include/views/configuration.item.edit.php:537 -#: include/views/configuration.item.edit.php:544 -#: include/views/configuration.item.massupdate.php:226 -#: include/views/configuration.item.prototype.edit.php:506 +#: include/views/configuration.host.discovery.edit.php:415 +#: include/views/configuration.item.edit.php:523 +#: include/views/configuration.item.edit.php:530 +#: include/views/configuration.item.massupdate.php:219 +#: include/views/configuration.item.prototype.edit.php:492 #: include/views/configuration.item.prototype.massupdate.php:215 #: include/views/js/configuration.discovery.edit.js.php:98 msgid "SHA" @@ -13845,18 +13858,18 @@ msgid "SNMP" msgstr "" #: disc_prototypes.php:114 host_discovery.php:100 include/forms.inc.php:453 -#: include/views/configuration.host.discovery.edit.php:393 -#: include/views/configuration.item.edit.php:488 -#: include/views/configuration.item.prototype.edit.php:472 +#: include/views/configuration.host.discovery.edit.php:378 +#: include/views/configuration.item.edit.php:474 +#: include/views/configuration.item.prototype.edit.php:457 #: include/views/js/configuration.discovery.edit.js.php:64 items.php:124 msgid "SNMP OID" msgstr "" #: disc_prototypes.php:107 host_discovery.php:95 include/forms.inc.php:428 -#: include/views/configuration.host.discovery.edit.php:405 -#: include/views/configuration.item.edit.php:501 -#: include/views/configuration.item.massupdate.php:185 -#: include/views/configuration.item.prototype.edit.php:484 +#: include/views/configuration.host.discovery.edit.php:390 +#: include/views/configuration.item.edit.php:487 +#: include/views/configuration.item.massupdate.php:182 +#: include/views/configuration.item.prototype.edit.php:469 #: include/views/configuration.item.prototype.massupdate.php:178 #: include/views/js/configuration.discovery.edit.js.php:48 items.php:117 msgid "SNMP community" @@ -13898,9 +13911,9 @@ msgid "SQL count: %1$s (selects: %2$s | executes: %3$s)" msgstr "" #: include/items.inc.php:1680 -#: include/views/configuration.host.discovery.edit.php:501 -#: include/views/configuration.item.edit.php:649 -#: include/views/configuration.item.prototype.edit.php:580 +#: include/views/configuration.host.discovery.edit.php:490 +#: include/views/configuration.item.edit.php:636 +#: include/views/configuration.item.prototype.edit.php:567 msgid "SQL query" msgstr "" @@ -13927,40 +13940,40 @@ msgstr "" msgid "SSH agent" msgstr "" -#: include/views/configuration.host.discovery.edit.php:330 +#: include/views/configuration.host.discovery.edit.php:316 #: include/views/configuration.httpconf.edit.php:175 -#: include/views/configuration.item.edit.php:371 -#: include/views/configuration.item.prototype.edit.php:359 +#: include/views/configuration.item.edit.php:359 +#: include/views/configuration.item.prototype.edit.php:344 msgid "SSL certificate file" msgstr "" -#: include/views/configuration.host.discovery.edit.php:339 +#: include/views/configuration.host.discovery.edit.php:324 #: include/views/configuration.httpconf.edit.php:178 -#: include/views/configuration.item.edit.php:379 -#: include/views/configuration.item.prototype.edit.php:367 +#: include/views/configuration.item.edit.php:366 +#: include/views/configuration.item.prototype.edit.php:351 msgid "SSL key file" msgstr "" -#: include/views/configuration.host.discovery.edit.php:347 +#: include/views/configuration.host.discovery.edit.php:331 #: include/views/configuration.httpconf.edit.php:181 -#: include/views/configuration.item.edit.php:387 -#: include/views/configuration.item.prototype.edit.php:375 +#: include/views/configuration.item.edit.php:373 +#: include/views/configuration.item.prototype.edit.php:358 msgid "SSL key password" msgstr "" #: app/views/administration.mediatype.edit.php:88 -#: include/views/configuration.host.discovery.edit.php:321 +#: include/views/configuration.host.discovery.edit.php:308 #: include/views/configuration.httpconf.edit.php:172 -#: include/views/configuration.item.edit.php:362 -#: include/views/configuration.item.prototype.edit.php:350 +#: include/views/configuration.item.edit.php:351 +#: include/views/configuration.item.prototype.edit.php:336 msgid "SSL verify host" msgstr "" #: app/views/administration.mediatype.edit.php:87 -#: include/views/configuration.host.discovery.edit.php:312 +#: include/views/configuration.host.discovery.edit.php:300 #: include/views/configuration.httpconf.edit.php:169 -#: include/views/configuration.item.edit.php:353 -#: include/views/configuration.item.prototype.edit.php:341 +#: include/views/configuration.item.edit.php:343 +#: include/views/configuration.item.prototype.edit.php:328 msgid "SSL verify peer" msgstr "" @@ -13984,7 +13997,7 @@ msgstr "" msgid "Sat" msgstr "" -#: include/forms.inc.php:1937 include/forms.inc.php:2052 +#: include/forms.inc.php:2185 include/forms.inc.php:2300 #: include/func.inc.php:140 include/func.inc.php:230 jsLoader.php:150 msgid "Saturday" msgstr "" @@ -14010,14 +14023,14 @@ msgstr "" msgid "Scheduled check" msgstr "" -#: include/views/configuration.host.discovery.edit.php:524 -#: include/views/configuration.item.edit.php:708 -#: include/views/configuration.item.edit.php:715 -#: include/views/configuration.item.massupdate.php:466 -#: include/views/configuration.item.prototype.edit.php:635 -#: include/views/configuration.item.prototype.massupdate.php:444 +#: include/views/configuration.host.discovery.edit.php:512 +#: include/views/configuration.item.edit.php:695 +#: include/views/configuration.item.edit.php:702 +#: include/views/configuration.item.massupdate.php:348 +#: include/views/configuration.item.prototype.edit.php:622 +#: include/views/configuration.item.prototype.massupdate.php:344 #: include/views/js/common.item.edit.js.php:10 -#: include/views/js/configuration.item.massupdate.js.php:10 +#: include/views/js/configuration.item.massupdate.js.php:14 msgid "Scheduling" msgstr "" @@ -14188,7 +14201,7 @@ msgstr "" msgid "Search" msgstr "" -#: app/views/administration.authentication.edit.php:98 +#: app/views/administration.authentication.edit.php:104 msgid "Search attribute" msgstr "" @@ -14228,20 +14241,20 @@ msgstr "" msgid "Seconds" msgstr "" -#: include/views/configuration.host.discovery.edit.php:423 -#: include/views/configuration.item.edit.php:530 -#: include/views/configuration.item.massupdate.php:209 -#: include/views/configuration.item.prototype.edit.php:502 +#: include/views/configuration.host.discovery.edit.php:404 +#: include/views/configuration.item.edit.php:516 +#: include/views/configuration.item.massupdate.php:203 +#: include/views/configuration.item.prototype.edit.php:481 #: include/views/configuration.item.prototype.massupdate.php:199 #: include/views/js/configuration.discovery.edit.js.php:86 msgid "Security level" msgstr "" #: include/forms.inc.php:432 -#: include/views/configuration.host.discovery.edit.php:411 -#: include/views/configuration.item.edit.php:507 -#: include/views/configuration.item.massupdate.php:201 -#: include/views/configuration.item.prototype.edit.php:490 +#: include/views/configuration.host.discovery.edit.php:396 +#: include/views/configuration.item.edit.php:493 +#: include/views/configuration.item.massupdate.php:196 +#: include/views/configuration.item.prototype.edit.php:475 #: include/views/configuration.item.prototype.massupdate.php:192 #: include/views/js/configuration.discovery.edit.js.php:79 msgid "Security name" @@ -14269,9 +14282,9 @@ msgstr "" #: include/views/configuration.graph.edit.php:185 #: include/views/configuration.graph.edit.php:266 #: include/views/configuration.item.edit.php:91 -#: include/views/configuration.item.prototype.edit.php:79 -#: include/views/configuration.item.prototype.edit.php:394 -#: include/views/configuration.item.prototype.massupdate.php:604 +#: include/views/configuration.item.prototype.edit.php:77 +#: include/views/configuration.item.prototype.edit.php:377 +#: include/views/configuration.item.prototype.massupdate.php:504 #: include/views/configuration.services.edit.php:90 #: include/views/js/monitoring.sysmaps.js.php:191 #: include/views/js/monitoring.sysmaps.js.php:210 @@ -14291,8 +14304,8 @@ msgstr "" #: app/views/popup.triggerexpr.php:72 #: include/views/configuration.graph.edit.php:206 #: include/views/configuration.graph.edit.php:287 -#: include/views/configuration.item.prototype.edit.php:411 -#: include/views/configuration.item.prototype.massupdate.php:620 +#: include/views/configuration.item.prototype.edit.php:394 +#: include/views/configuration.item.prototype.massupdate.php:520 msgid "Select prototype" msgstr "" @@ -14396,7 +14409,7 @@ msgstr "" msgid "Separated" msgstr "" -#: include/forms.inc.php:1975 include/func.inc.php:124 +#: include/forms.inc.php:2223 include/func.inc.php:124 #: include/func.inc.php:261 jsLoader.php:141 msgid "September" msgstr "" @@ -14534,9 +14547,7 @@ msgstr "" msgid "Set custom time period" msgstr "" -#: include/views/configuration.item.edit.php:1079 -#: include/views/configuration.item.prototype.edit.php:912 -#: include/views/js/common.item.edit.js.php:82 +#: include/forms.inc.php:1543 include/views/js/item.preprocessing.js.php:51 msgid "Set error to" msgstr "" @@ -14544,9 +14555,7 @@ msgstr "" msgid "Set host inventory mode" msgstr "" -#: include/views/configuration.item.edit.php:1078 -#: include/views/configuration.item.prototype.edit.php:911 -#: include/views/js/common.item.edit.js.php:81 +#: include/forms.inc.php:1542 include/views/js/item.preprocessing.js.php:50 msgid "Set value to" msgstr "" @@ -14742,10 +14751,10 @@ msgstr "" msgid "Show unavailable maps" msgstr "" -#: include/views/configuration.item.edit.php:841 -#: include/views/configuration.item.massupdate.php:561 -#: include/views/configuration.item.prototype.edit.php:714 -#: include/views/configuration.item.prototype.massupdate.php:541 +#: include/views/configuration.item.edit.php:826 +#: include/views/configuration.item.massupdate.php:442 +#: include/views/configuration.item.prototype.edit.php:701 +#: include/views/configuration.item.prototype.massupdate.php:441 msgid "Show value" msgstr "" @@ -14777,7 +14786,7 @@ msgstr "" msgid "Simple" msgstr "" -#: include/items.inc.php:1750 +#: include/items.inc.php:1741 msgid "Simple change" msgstr "" @@ -15077,7 +15086,7 @@ msgstr "" #: include/views/configuration.httpconf.list.php:95 #: include/views/configuration.item.list.php:71 #: include/views/configuration.item.list.php:152 -#: include/views/configuration.item.massupdate.php:536 +#: include/views/configuration.item.massupdate.php:420 #: include/views/configuration.triggers.list.php:46 #: include/views/configuration.triggers.list.php:171 srv_status.php:146 msgid "Status" @@ -15169,7 +15178,7 @@ msgstr "" msgid "Straight" msgstr "" -#: include/items.inc.php:1735 +#: include/items.inc.php:1728 include/items.inc.php:1732 msgid "Structured data" msgstr "" @@ -15222,7 +15231,7 @@ msgstr "" msgid "Sun" msgstr "" -#: include/forms.inc.php:1942 include/forms.inc.php:2057 +#: include/forms.inc.php:2190 include/forms.inc.php:2305 #: include/func.inc.php:142 include/func.inc.php:224 jsLoader.php:151 msgid "Sunday" msgstr "" @@ -15447,9 +15456,9 @@ msgstr "" msgid "Template \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHostGroup.php:1454 +#: include/classes/api/services/CHostGroup.php:1471 #: include/classes/api/services/CTemplate.php:368 -#: include/classes/api/services/CTemplate.php:988 +#: include/classes/api/services/CTemplate.php:986 #, c-format msgid "Template \"%1$s\" cannot be without host group." msgstr "" @@ -15509,25 +15518,25 @@ msgstr "" msgid "Template value" msgstr "" -#: include/classes/api/services/CTemplate.php:1043 +#: include/classes/api/services/CTemplate.php:1041 #, c-format msgid "Template with the same name \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHost.php:1757 -#: include/classes/api/services/CHost.php:1980 +#: include/classes/api/services/CHost.php:1793 +#: include/classes/api/services/CHost.php:2016 #, c-format msgid "Template with the same name \"%s\" already exists." msgstr "" #: include/classes/api/services/CTemplate.php:447 -#: include/classes/api/services/CTemplate.php:1008 +#: include/classes/api/services/CTemplate.php:1006 #, c-format msgid "Template with the same visible name \"%1$s\" already exists." msgstr "" -#: include/classes/api/services/CHost.php:1763 -#: include/classes/api/services/CHost.php:1988 +#: include/classes/api/services/CHost.php:1799 +#: include/classes/api/services/CHost.php:2024 #, c-format msgid "Template with the same visible name \"%s\" already exists." msgstr "" @@ -15561,7 +15570,7 @@ msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"." msgstr "" #: app/controllers/CControllerPopupTestTriggerExpr.php:147 -#: app/views/administration.authentication.edit.php:140 +#: app/views/administration.authentication.edit.php:150 #: app/views/popup.testtriggerexpr.php:110 #: include/views/administration.general.regularexpressions.edit.php:139 #: include/views/configuration.trigger.prototype.edit.php:239 @@ -15571,7 +15580,7 @@ msgstr "" msgid "Test" msgstr "" -#: app/views/administration.authentication.edit.php:114 +#: app/views/administration.authentication.edit.php:122 msgid "Test authentication" msgstr "" @@ -15593,9 +15602,11 @@ msgid "Test string" msgstr "" #: include/forms.inc.php:355 include/items.inc.php:135 -#: include/items.inc.php:1726 include/views/configuration.item.edit.php:680 -#: include/views/configuration.item.massupdate.php:281 -#: include/views/configuration.item.prototype.edit.php:609 +#: include/items.inc.php:1712 include/items.inc.php:1716 +#: include/items.inc.php:1720 include/items.inc.php:1724 +#: include/views/configuration.item.edit.php:667 +#: include/views/configuration.item.massupdate.php:269 +#: include/views/configuration.item.prototype.edit.php:596 #: include/views/configuration.item.prototype.massupdate.php:264 #: include/views/js/monitoring.sysmaps.js.php:308 #: include/views/js/monitoring.sysmaps.js.php:459 @@ -15743,7 +15754,7 @@ msgstr "" msgid "Threshold" msgstr "" -#: include/items.inc.php:1774 +#: include/items.inc.php:1784 include/items.inc.php:1788 msgid "Throttling" msgstr "" @@ -15751,7 +15762,7 @@ msgstr "" msgid "Thu" msgstr "" -#: include/forms.inc.php:1927 include/forms.inc.php:2042 +#: include/forms.inc.php:2175 include/forms.inc.php:2290 #: include/func.inc.php:138 include/func.inc.php:228 jsLoader.php:148 msgid "Thursday" msgstr "" @@ -15832,10 +15843,10 @@ msgid "Time zone for PHP is not set (configuration parameter \"date.timezone\"). msgstr "" #: app/views/popup.httpstep.php:147 -#: include/views/configuration.host.discovery.edit.php:162 +#: include/views/configuration.host.discovery.edit.php:159 #: include/views/configuration.httpconf.edit.php:196 #: include/views/configuration.item.edit.php:194 -#: include/views/configuration.item.prototype.edit.php:182 +#: include/views/configuration.item.prototype.edit.php:179 msgid "Timeout" msgstr "" @@ -15946,10 +15957,10 @@ msgstr "" msgid "Trend data storage period \"%1$s\"." msgstr "" -#: disc_prototypes.php:198 include/views/configuration.item.edit.php:809 -#: include/views/configuration.item.massupdate.php:524 -#: include/views/configuration.item.prototype.edit.php:688 -#: include/views/configuration.item.prototype.massupdate.php:503 items.php:77 +#: disc_prototypes.php:198 include/views/configuration.item.edit.php:797 +#: include/views/configuration.item.massupdate.php:407 +#: include/views/configuration.item.prototype.edit.php:676 +#: include/views/configuration.item.prototype.massupdate.php:403 items.php:77 msgid "Trend storage period" msgstr "" @@ -15989,7 +16000,7 @@ msgstr "" msgid "Trigger \"%1$s\" belongs to templates with different linkages." msgstr "" -#: include/classes/import/CConfigurationImport.php:1610 +#: include/classes/import/CConfigurationImport.php:1618 #, c-format msgid "Trigger \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "" @@ -16104,7 +16115,7 @@ msgstr "" msgid "Trigger prototype \"%1$s\" contains item prototypes from multiple discovery rules." msgstr "" -#: include/classes/import/CConfigurationImport.php:1332 +#: include/classes/import/CConfigurationImport.php:1340 #, c-format msgid "Trigger prototype \"%1$s\" depends on trigger \"%2$s\", which does not exist." msgstr "" @@ -16209,7 +16220,7 @@ msgstr "" msgid "Triggers top 100" msgstr "" -#: include/items.inc.php:1729 +#: include/items.inc.php:1717 msgid "Trim" msgstr "" @@ -16222,7 +16233,7 @@ msgstr "" msgid "Tue" msgstr "" -#: include/forms.inc.php:1917 include/forms.inc.php:2032 +#: include/forms.inc.php:2165 include/forms.inc.php:2280 #: include/func.inc.php:136 include/func.inc.php:226 jsLoader.php:146 msgid "Tuesday" msgstr "" @@ -16231,7 +16242,7 @@ msgstr "" msgid "Turkish (tr_TR)" msgstr "" -#: include/classes/api/services/CItem.php:1015 +#: include/classes/api/services/CItem.php:965 #, c-format msgid "Two items (\"%1$s\" and \"%2$s\") cannot populate one host inventory field \"%3$s\", this would lead to a conflict." msgstr "" @@ -16262,22 +16273,22 @@ msgstr "" #: include/views/configuration.action.edit.php:1706 #: include/views/configuration.action.edit.php:2156 #: include/views/configuration.graph.edit.php:332 -#: include/views/configuration.host.discovery.edit.php:56 -#: include/views/configuration.host.discovery.edit.php:61 -#: include/views/configuration.host.discovery.edit.php:518 +#: include/views/configuration.host.discovery.edit.php:54 +#: include/views/configuration.host.discovery.edit.php:59 +#: include/views/configuration.host.discovery.edit.php:506 #: include/views/configuration.host.discovery.list.php:58 #: include/views/configuration.item.edit.php:73 #: include/views/configuration.item.edit.php:78 -#: include/views/configuration.item.edit.php:700 +#: include/views/configuration.item.edit.php:687 #: include/views/configuration.item.list.php:69 -#: include/views/configuration.item.massupdate.php:42 -#: include/views/configuration.item.massupdate.php:455 -#: include/views/configuration.item.prototype.edit.php:61 -#: include/views/configuration.item.prototype.edit.php:66 -#: include/views/configuration.item.prototype.edit.php:629 +#: include/views/configuration.item.massupdate.php:41 +#: include/views/configuration.item.massupdate.php:337 +#: include/views/configuration.item.prototype.edit.php:59 +#: include/views/configuration.item.prototype.edit.php:64 +#: include/views/configuration.item.prototype.edit.php:616 #: include/views/configuration.item.prototype.list.php:57 #: include/views/configuration.item.prototype.massupdate.php:37 -#: include/views/configuration.item.prototype.massupdate.php:433 +#: include/views/configuration.item.prototype.massupdate.php:333 #: include/views/configuration.maintenance.list.php:71 #: include/views/configuration.services.edit.php:170 #: include/views/inventory.host.list.php:67 @@ -16312,17 +16323,17 @@ msgstr "" #: include/views/configuration.action.edit.php:118 #: include/views/configuration.action.edit.php:1155 #: include/views/configuration.correlation.edit.php:91 -#: include/views/configuration.host.discovery.edit.php:594 +#: include/views/configuration.host.discovery.edit.php:582 msgid "Type of calculation" msgstr "" #: app/controllers/CControllerPopupGeneric.php:213 #: app/controllers/CControllerPopupGeneric.php:276 include/forms.inc.php:348 -#: include/forms.inc.php:842 include/views/configuration.item.edit.php:668 -#: include/views/configuration.item.edit.php:674 -#: include/views/configuration.item.massupdate.php:274 -#: include/views/configuration.item.prototype.edit.php:597 -#: include/views/configuration.item.prototype.edit.php:603 +#: include/forms.inc.php:842 include/views/configuration.item.edit.php:655 +#: include/views/configuration.item.edit.php:661 +#: include/views/configuration.item.massupdate.php:262 +#: include/views/configuration.item.prototype.edit.php:584 +#: include/views/configuration.item.prototype.edit.php:590 #: include/views/configuration.item.prototype.massupdate.php:257 msgid "Type of information" msgstr "" @@ -16341,15 +16352,15 @@ msgid "UNKNOWN" msgstr "" #: app/views/popup.httpstep.php:50 app/views/popup.triggerwizard.php:183 -#: disc_prototypes.php:207 host_discovery.php:152 +#: disc_prototypes.php:207 host_discovery.php:153 #: include/classes/widgets/CWidgetConfig.php:50 #: include/classes/widgets/forms/CWidgetFormUrl.php:31 #: include/screens.inc.php:44 -#: include/views/configuration.host.discovery.edit.php:76 +#: include/views/configuration.host.discovery.edit.php:74 #: include/views/configuration.httpconf.edit.php:197 -#: include/views/configuration.item.edit.php:108 -#: include/views/configuration.item.massupdate.php:105 -#: include/views/configuration.item.prototype.edit.php:97 +#: include/views/configuration.item.edit.php:109 +#: include/views/configuration.item.massupdate.php:104 +#: include/views/configuration.item.prototype.edit.php:95 #: include/views/configuration.item.prototype.massupdate.php:100 #: include/views/configuration.trigger.prototype.edit.php:535 #: include/views/configuration.triggers.edit.php:569 @@ -16375,7 +16386,7 @@ msgstr "" msgid "URL C" msgstr "" -#: include/views/js/common.item.edit.js.php:732 +#: include/views/js/common.item.edit.js.php:323 #: include/views/js/configuration.httpconf.edit.js.php:654 msgid "URL is not properly encoded." msgstr "" @@ -16459,9 +16470,9 @@ msgstr "" #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:154 #: include/classes/widgets/forms/CWidgetFormSvgGraph.php:227 -#: include/views/configuration.item.edit.php:685 -#: include/views/configuration.item.massupdate.php:288 -#: include/views/configuration.item.prototype.edit.php:614 +#: include/views/configuration.item.edit.php:673 +#: include/views/configuration.item.massupdate.php:275 +#: include/views/configuration.item.prototype.edit.php:602 #: include/views/configuration.item.prototype.massupdate.php:270 msgid "Units" msgstr "" @@ -16556,42 +16567,42 @@ msgstr "" msgid "Unlink from templates" msgstr "" -#: include/classes/api/services/CHostGeneral.php:630 +#: include/classes/api/services/CHostGeneral.php:626 #, c-format msgid "Unlinked: Application \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:376 +#: include/classes/api/services/CHostGeneral.php:372 #, c-format msgid "Unlinked: Discovery rule \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:533 +#: include/classes/api/services/CHostGeneral.php:529 #, c-format msgid "Unlinked: Graph \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:517 +#: include/classes/api/services/CHostGeneral.php:513 #, c-format msgid "Unlinked: Graph prototype \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:466 +#: include/classes/api/services/CHostGeneral.php:462 #, c-format msgid "Unlinked: Host prototype \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:392 +#: include/classes/api/services/CHostGeneral.php:388 #, c-format msgid "Unlinked: Item \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:411 +#: include/classes/api/services/CHostGeneral.php:407 #, c-format msgid "Unlinked: Item prototype \"%1$s\" on \"%2$s\"." msgstr "" -#: include/classes/api/services/CHostGeneral.php:572 +#: include/classes/api/services/CHostGeneral.php:568 #, c-format msgid "Unlinked: Web scenario \"%1$s\" on \"%2$s\"." msgstr "" @@ -16615,7 +16626,7 @@ msgstr "" msgid "Unsupported parameter \"%2$s\" for a filter condition of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1118 +#: include/classes/api/services/CDiscoveryRule.php:1282 #, c-format msgid "Unsupported parameter \"%2$s\" for a filter condition of discovery rule \"%1$s\"." msgstr "" @@ -16625,7 +16636,7 @@ msgstr "" msgid "Unsupported parameter \"%2$s\" for the filter of action \"%1$s\"." msgstr "" -#: include/classes/api/services/CDiscoveryRule.php:1086 +#: include/classes/api/services/CDiscoveryRule.php:1250 #, c-format msgid "Unsupported parameter \"%2$s\" for the filter of discovery rule \"%1$s\"." msgstr "" @@ -16640,7 +16651,7 @@ msgctxt "discovery status" msgid "Up" msgstr "" -#: app/views/administration.authentication.edit.php:139 +#: app/views/administration.authentication.edit.php:149 #: app/views/administration.mediatype.edit.php:241 #: app/views/administration.proxy.edit.php:132 #: app/views/administration.script.edit.php:127 @@ -16670,16 +16681,16 @@ msgstr "" #: include/views/configuration.correlation.edit.php:276 #: include/views/configuration.discovery.edit.php:108 #: include/views/configuration.graph.edit.php:449 -#: include/views/configuration.host.discovery.edit.php:709 +#: include/views/configuration.host.discovery.edit.php:771 #: include/views/configuration.host.edit.php:810 #: include/views/configuration.hostgroups.edit.php:57 #: include/views/configuration.host.massupdate.php:371 #: include/views/configuration.host.prototype.edit.php:434 #: include/views/configuration.httpconf.edit.php:306 -#: include/views/configuration.item.edit.php:1191 -#: include/views/configuration.item.massupdate.php:695 -#: include/views/configuration.item.prototype.edit.php:1003 -#: include/views/configuration.item.prototype.massupdate.php:689 +#: include/views/configuration.item.edit.php:953 +#: include/views/configuration.item.massupdate.php:577 +#: include/views/configuration.item.prototype.edit.php:768 +#: include/views/configuration.item.prototype.massupdate.php:589 #: include/views/configuration.maintenance.edit.php:134 #: include/views/configuration.maintenance.edit.php:285 #: include/views/configuration.services.edit.php:353 @@ -16703,12 +16714,12 @@ msgstr "" #: discoveryconf.php:39 disc_prototypes.php:58 host_discovery.php:54 #: include/forms.inc.php:394 include/views/configuration.discovery.edit.php:59 -#: include/views/configuration.host.discovery.edit.php:508 +#: include/views/configuration.host.discovery.edit.php:496 #: include/views/configuration.httpconf.edit.php:80 -#: include/views/configuration.item.edit.php:690 -#: include/views/configuration.item.massupdate.php:510 -#: include/views/configuration.item.prototype.edit.php:619 -#: include/views/configuration.item.prototype.massupdate.php:489 items.php:57 +#: include/views/configuration.item.edit.php:677 +#: include/views/configuration.item.massupdate.php:393 +#: include/views/configuration.item.prototype.edit.php:606 +#: include/views/configuration.item.prototype.massupdate.php:389 items.php:57 #: items.php:306 msgid "Update interval" msgstr "" @@ -16750,7 +16761,7 @@ msgstr "" msgid "Upload" msgstr "" -#: include/html.inc.php:542 include/html.inc.php:555 +#: include/html.inc.php:542 include/html.inc.php:545 msgid "Upper level maps" msgstr "" @@ -16959,18 +16970,18 @@ msgstr "" #: include/views/configuration.action.edit.php:958 #: include/views/configuration.action.edit.php:1737 #: include/views/configuration.action.edit.php:2201 -#: include/views/configuration.host.discovery.edit.php:294 -#: include/views/configuration.host.discovery.edit.php:471 -#: include/views/configuration.item.edit.php:335 -#: include/views/configuration.item.edit.php:618 -#: include/views/configuration.item.massupdate.php:307 -#: include/views/configuration.item.prototype.edit.php:323 -#: include/views/configuration.item.prototype.edit.php:550 +#: include/views/configuration.host.discovery.edit.php:284 +#: include/views/configuration.host.discovery.edit.php:460 +#: include/views/configuration.item.edit.php:327 +#: include/views/configuration.item.edit.php:605 +#: include/views/configuration.item.massupdate.php:292 +#: include/views/configuration.item.prototype.edit.php:312 +#: include/views/configuration.item.prototype.edit.php:537 #: include/views/configuration.item.prototype.massupdate.php:287 items.php:90 msgid "User name" msgstr "" -#: app/views/administration.authentication.edit.php:120 +#: app/views/administration.authentication.edit.php:129 msgid "User password" msgstr "" @@ -17034,7 +17045,7 @@ msgstr "" #: app/views/administration.mediatype.edit.php:95 #: app/views/administration.mediatype.edit.php:159 #: app/views/administration.mediatype.list.php:93 disc_prototypes.php:259 -#: host_discovery.php:201 include/views/configuration.host.edit.php:666 +#: host_discovery.php:202 include/views/configuration.host.edit.php:666 #: include/views/configuration.host.prototype.edit.php:335 #: include/views/general.login.php:60 index.php:33 items.php:257 msgid "Username" @@ -17252,7 +17263,9 @@ msgstr "" msgid "VMware virtual machine uptime, <url> - VMware service URL, <uuid> - VMware virtual machine host name" msgstr "" -#: include/items.inc.php:1763 +#: include/items.inc.php:1760 include/items.inc.php:1764 +#: include/items.inc.php:1768 include/items.inc.php:1772 +#: include/items.inc.php:1776 include/items.inc.php:1780 msgid "Validation" msgstr "" @@ -17265,14 +17278,14 @@ msgstr "" #: include/classes/screens/CScreenPlainText.php:53 #: include/views/administration.general.macros.edit.php:38 #: include/views/administration.general.valuemapping.edit.php:55 -#: include/views/configuration.host.discovery.edit.php:110 -#: include/views/configuration.host.discovery.edit.php:205 +#: include/views/configuration.host.discovery.edit.php:109 +#: include/views/configuration.host.discovery.edit.php:201 #: include/views/configuration.httpconf.edit.php:125 -#: include/views/configuration.item.edit.php:142 -#: include/views/configuration.item.edit.php:237 -#: include/views/configuration.item.massupdate.php:154 -#: include/views/configuration.item.prototype.edit.php:130 -#: include/views/configuration.item.prototype.edit.php:225 +#: include/views/configuration.item.edit.php:144 +#: include/views/configuration.item.edit.php:236 +#: include/views/configuration.item.massupdate.php:152 +#: include/views/configuration.item.prototype.edit.php:129 +#: include/views/configuration.item.prototype.edit.php:221 #: include/views/configuration.item.prototype.massupdate.php:148 #: include/views/configuration.triggers.list.php:55 #: include/views/configuration.triggers.list.php:167 @@ -17452,7 +17465,7 @@ msgstr "" msgid "Visible name" msgstr "" -#: include/classes/api/services/CHost.php:1891 +#: include/classes/api/services/CHost.php:1927 msgid "Visible name cannot be empty if host name is missing." msgstr "" @@ -17514,7 +17527,7 @@ msgstr "" msgid "Web scenario \"%1$s\" already exists." msgstr "" -#: include/classes/import/CConfigurationImport.php:1382 +#: include/classes/import/CConfigurationImport.php:1390 #, c-format msgid "Web scenario \"%1$s\" on \"%2$s\": application \"%3$s\" does not exist." msgstr "" @@ -17551,12 +17564,12 @@ msgstr "" msgid "Wed" msgstr "" -#: include/forms.inc.php:1922 include/forms.inc.php:2037 +#: include/forms.inc.php:2170 include/forms.inc.php:2285 #: include/func.inc.php:137 include/func.inc.php:227 jsLoader.php:147 msgid "Wednesday" msgstr "" -#: app/views/report.services.php:35 include/forms.inc.php:1876 +#: app/views/report.services.php:35 include/forms.inc.php:2124 #: include/maintenances.inc.php:35 report4.php:108 msgid "Weekly" msgstr "" @@ -17656,8 +17669,8 @@ msgstr "" msgid "Wrong fields for dependency for service \"%1$s\"." msgstr "" -#: include/classes/api/services/CHost.php:1605 -#: include/classes/api/services/CHost.php:1786 +#: include/classes/api/services/CHost.php:1641 +#: include/classes/api/services/CHost.php:1822 #, c-format msgid "Wrong fields for host \"%1$s\"." msgstr "" @@ -17736,23 +17749,27 @@ msgstr "" msgid "X2" msgstr "" -#: include/items.inc.php:1737 +#: include/items.inc.php:1729 msgid "XML XPath" msgstr "" -#: include/views/configuration.host.discovery.edit.php:173 -#: include/views/configuration.item.edit.php:205 -#: include/views/configuration.item.massupdate.php:120 -#: include/views/configuration.item.prototype.edit.php:193 +#: include/views/configuration.host.discovery.edit.php:169 +#: include/views/configuration.item.edit.php:204 +#: include/views/configuration.item.massupdate.php:118 +#: include/views/configuration.item.prototype.edit.php:189 #: include/views/configuration.item.prototype.massupdate.php:114 msgid "XML data" msgstr "" -#: include/classes/api/services/CItemGeneral.php:2222 +#: include/classes/api/services/CItemGeneral.php:2185 #: include/classes/import/readers/CXmlImportReader.php:35 msgid "XML is empty" msgstr "" +#: include/forms.inc.php:1469 include/views/js/item.preprocessing.js.php:154 +msgid "XPath" +msgstr "" + #: include/views/js/monitoring.sysmaps.js.php:248 #: include/views/js/monitoring.sysmaps.js.php:384 msgid "Y" @@ -17804,7 +17821,7 @@ msgstr "" msgid "Y2" msgstr "" -#: include/forms.inc.php:2092 +#: include/forms.inc.php:2340 #: include/views/configuration.maintenance.edit.php:57 #: include/views/configuration.maintenance.edit.php:63 #: include/views/configuration.services.edit.php:246 @@ -17817,7 +17834,7 @@ msgstr "" #: include/classes/import/validators/C32XmlValidator.php:1007 #: include/classes/import/validators/C34XmlValidator.php:1111 #: include/classes/import/validators/C40XmlValidator.php:1290 -#: include/classes/import/validators/C42XmlValidator.php:1298 +#: include/classes/import/validators/C42XmlValidator.php:1326 msgctxt "XML date and time format" msgid "YYYY-MM-DDThh:mm:ssZ" msgstr "" @@ -17904,8 +17921,8 @@ msgstr "" #: include/classes/api/services/CTemplate.php:388 #: include/classes/api/services/CTemplate.php:529 #: include/classes/api/services/CTemplate.php:561 -#: include/classes/api/services/CTemplate.php:980 -#: include/classes/api/services/CTemplate.php:1085 +#: include/classes/api/services/CTemplate.php:978 +#: include/classes/api/services/CTemplate.php:1083 #: include/classes/api/services/CUserMacro.php:266 #: include/classes/api/services/CUserMacro.php:350 #: include/classes/api/services/CUserMacro.php:443 @@ -17989,7 +18006,7 @@ msgstr "" msgid "Zabbix internal authentication" msgstr "" -#: app/views/administration.authentication.edit.php:43 +#: app/views/administration.authentication.edit.php:44 msgid "Zabbix login form" msgstr "" @@ -18060,7 +18077,7 @@ msgstr "" msgid "[Wrong value for month: \"%s\" ]" msgstr "" -#: include/classes/validators/CApiInputValidator.php:593 +#: include/classes/validators/CApiInputValidator.php:597 msgid "a boolean is expected" msgstr "" @@ -18068,33 +18085,37 @@ msgstr "" #: include/classes/api/services/CTriggerGeneral.php:257 #: include/classes/api/services/CUser.php:649 #: include/classes/import/validators/CXmlValidatorGeneral.php:193 -#: include/classes/validators/CApiInputValidator.php:230 +#: include/classes/validators/CApiInputValidator.php:234 #: include/classes/validators/CNewValidator.php:278 msgid "a character string is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:271 +#: include/classes/validators/CApiInputValidator.php:275 msgid "a hexadecimal colour code (6 symbols) is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:417 -#: include/classes/validators/CApiInputValidator.php:554 -#: include/classes/validators/CApiInputValidator.php:952 +#: include/classes/validators/CApiInputValidator.php:1059 +msgid "a low-level discovery macro is expected" +msgstr "" + +#: include/classes/validators/CApiInputValidator.php:421 +#: include/classes/validators/CApiInputValidator.php:558 +#: include/classes/validators/CApiInputValidator.php:956 msgid "a number is expected" msgstr "" #: app/controllers/CControllerPopupHttpStep.php:109 -#: include/classes/validators/CApiInputValidator.php:422 -#: include/classes/validators/CApiInputValidator.php:564 -#: include/classes/validators/CApiInputValidator.php:959 -#: include/classes/validators/CApiInputValidator.php:1185 +#: include/classes/validators/CApiInputValidator.php:426 +#: include/classes/validators/CApiInputValidator.php:568 +#: include/classes/validators/CApiInputValidator.php:963 +#: include/classes/validators/CApiInputValidator.php:1218 msgid "a number is too large" msgstr "" #: include/classes/api/services/CDRule.php:320 -#: include/classes/api/services/CItemGeneral.php:1233 -#: include/classes/api/services/CItemGeneral.php:1306 -#: include/classes/api/services/CItemGeneral.php:1316 +#: include/classes/api/services/CItemGeneral.php:1323 +#: include/classes/api/services/CItemGeneral.php:1396 +#: include/classes/api/services/CItemGeneral.php:1406 #: include/classes/api/services/CScreen.php:423 msgid "a numeric value is expected" msgstr "" @@ -18104,23 +18125,23 @@ msgid "a time is expected" msgstr "" #: app/controllers/CControllerPopupMedia.php:110 -#: include/classes/validators/CApiInputValidator.php:1093 +#: include/classes/validators/CApiInputValidator.php:1126 #: include/validate.inc.php:216 msgid "a time period is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1059 +#: include/classes/validators/CApiInputValidator.php:1092 #: include/validate.inc.php:235 msgid "a time range is expected" msgstr "" #: app/controllers/CControllerPopupHttpStep.php:103 -#: include/classes/validators/CApiInputValidator.php:1174 +#: include/classes/validators/CApiInputValidator.php:1207 #: include/validate.inc.php:227 include/validate.inc.php:570 msgid "a time unit is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1026 +#: include/classes/validators/CApiInputValidator.php:1030 msgid "a user macro is expected" msgstr "" @@ -18163,18 +18184,18 @@ msgstr "" #: include/classes/api/services/CDRule.php:463 #: include/classes/api/services/CDRule.php:470 -#: include/classes/api/services/CItemGeneral.php:2161 -#: include/classes/api/services/CItemGeneral.php:2185 +#: include/classes/api/services/CItemGeneral.php:2124 +#: include/classes/api/services/CItemGeneral.php:2148 #: include/classes/import/validators/CXmlValidatorGeneral.php:207 -#: include/classes/validators/CApiInputValidator.php:370 -#: include/classes/validators/CApiInputValidator.php:508 -#: include/classes/validators/CApiInputValidator.php:648 -#: include/classes/validators/CApiInputValidator.php:756 -#: include/classes/validators/CApiInputValidator.php:798 +#: include/classes/validators/CApiInputValidator.php:374 +#: include/classes/validators/CApiInputValidator.php:512 +#: include/classes/validators/CApiInputValidator.php:652 +#: include/classes/validators/CApiInputValidator.php:760 +#: include/classes/validators/CApiInputValidator.php:802 msgid "an array is expected" msgstr "" -#: include/classes/validators/CApiInputValidator.php:727 +#: include/classes/validators/CApiInputValidator.php:731 msgid "an array or a character string is expected" msgstr "" @@ -18183,7 +18204,7 @@ msgstr "" msgid "an empty string is expected" msgstr "" -#: include/classes/api/services/CHost.php:1548 +#: include/classes/api/services/CHost.php:1584 msgid "an even number of hexadecimal characters is expected" msgstr "" @@ -18274,6 +18295,7 @@ msgstr "" #: include/classes/api/services/CCorrelation.php:1101 #: include/classes/api/services/CCorrelation.php:1118 #: include/classes/api/services/CCorrelation.php:1137 +#: include/classes/api/services/CDiscoveryRule.php:1423 #: include/classes/api/services/CDRule.php:203 #: include/classes/api/services/CDRule.php:209 #: include/classes/api/services/CDRule.php:319 @@ -18281,19 +18303,19 @@ msgstr "" #: include/classes/api/services/CDRule.php:357 #: include/classes/api/services/CDRule.php:512 #: include/classes/api/services/CEvent.php:847 -#: include/classes/api/services/CHost.php:1536 -#: include/classes/api/services/CHost.php:1542 +#: include/classes/api/services/CHost.php:1572 +#: include/classes/api/services/CHost.php:1578 #: include/classes/api/services/CHttpTest.php:982 #: include/classes/api/services/CItemGeneral.php:485 #: include/classes/api/services/CItemGeneral.php:512 #: include/classes/api/services/CItemGeneral.php:518 #: include/classes/api/services/CItemGeneral.php:524 -#: include/classes/api/services/CItemGeneral.php:1201 -#: include/classes/api/services/CItemGeneral.php:1223 -#: include/classes/api/services/CItemGeneral.php:1254 -#: include/classes/api/services/CItemGeneral.php:1268 -#: include/classes/api/services/CItemGeneral.php:1294 -#: include/classes/api/services/CItemGeneral.php:1465 +#: include/classes/api/services/CItemGeneral.php:1291 +#: include/classes/api/services/CItemGeneral.php:1313 +#: include/classes/api/services/CItemGeneral.php:1344 +#: include/classes/api/services/CItemGeneral.php:1358 +#: include/classes/api/services/CItemGeneral.php:1384 +#: include/classes/api/services/CItemGeneral.php:1555 #: include/classes/api/services/CMapElement.php:95 #: include/classes/api/services/CMapElement.php:114 #: include/classes/api/services/CMapElement.php:152 @@ -18314,19 +18336,19 @@ msgstr "" #: include/classes/api/services/CUserGroup.php:463 #: include/classes/api/services/CUser.php:532 #: include/classes/api/services/CUser.php:660 -#: include/classes/validators/CApiInputValidator.php:240 -#: include/classes/validators/CApiInputValidator.php:375 -#: include/classes/validators/CApiInputValidator.php:513 -#: include/classes/validators/CApiInputValidator.php:559 -#: include/classes/validators/CApiInputValidator.php:761 -#: include/classes/validators/CApiInputValidator.php:803 +#: include/classes/validators/CApiInputValidator.php:244 +#: include/classes/validators/CApiInputValidator.php:379 +#: include/classes/validators/CApiInputValidator.php:517 +#: include/classes/validators/CApiInputValidator.php:563 +#: include/classes/validators/CApiInputValidator.php:765 +#: include/classes/validators/CApiInputValidator.php:807 #: include/classes/validators/CNewValidator.php:91 #: include/classes/widgets/forms/CWidgetFormMap.php:101 usergrps.php:341 #: usergrps.php:381 usergrps.php:384 msgid "cannot be empty" msgstr "" -#: include/classes/api/services/CItemGeneral.php:2177 +#: include/classes/api/services/CItemGeneral.php:2140 msgid "cannot convert to JSON, result value too long" msgstr "" @@ -18334,6 +18356,10 @@ msgstr "" msgid "cannot perform Scroll API request, data could be truncated" msgstr "" +#: include/classes/api/services/CDiscoveryRule.php:1406 +msgid "cannot update property for templated discovery rule" +msgstr "" + #: app/controllers/CControllerPopupTriggerExpr.php:246 msgid "change() - Difference between last and previous value" msgstr "" @@ -18343,11 +18369,8 @@ msgstr "" msgid "check expression starting from \"%1$s\"" msgstr "" -#: include/classes/api/services/CHostGeneral.php:1024 -#: include/classes/api/services/CItemGeneral.php:1730 -#: include/classes/api/services/CItemGeneral.php:1736 -#: include/classes/api/services/CItemGeneral.php:1973 -#: include/classes/import/CConfigurationImport.php:2611 +#: include/classes/api/services/CItemGeneral.php:1848 +#: include/classes/import/CConfigurationImport.php:2619 msgid "circular item dependency is not allowed" msgstr "" @@ -18426,7 +18449,7 @@ msgstr "" msgid "diff() - Difference between last and preceding values (1 - true, 0 - false)" msgstr "" -#: include/classes/validators/CApiInputValidator.php:996 +#: include/classes/validators/CApiInputValidator.php:1000 msgid "directory or script name cannot be empty" msgstr "" @@ -18455,8 +18478,8 @@ msgid "does not equal" msgstr "" #: include/actions.inc.php:35 -#: include/views/configuration.host.discovery.edit.php:634 -#: include/views/js/configuration.host.discovery.edit.js.php:25 +#: include/views/configuration.host.discovery.edit.php:622 +#: include/views/js/configuration.host.discovery.edit.js.php:27 msgid "does not match" msgstr "" @@ -18465,7 +18488,7 @@ msgstr "" msgid "equals" msgstr "" -#: include/views/js/common.item.edit.js.php:311 +#: include/views/js/item.preprocessing.js.php:266 msgid "error message" msgstr "" @@ -18481,11 +18504,11 @@ msgstr "" msgid "failed to parse JSON" msgstr "" -#: include/forms.inc.php:2018 include/maintenances.inc.php:111 +#: include/forms.inc.php:2266 include/maintenances.inc.php:111 msgid "first" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1276 +#: include/classes/api/services/CItemGeneral.php:1366 msgid "first parameter is expected" msgstr "" @@ -18493,7 +18516,7 @@ msgstr "" msgid "forecast() - Forecast for next t seconds based on period T" msgstr "" -#: include/forms.inc.php:2021 include/maintenances.inc.php:114 +#: include/forms.inc.php:2269 include/maintenances.inc.php:114 msgid "fourth" msgstr "" @@ -18501,10 +18524,10 @@ msgstr "" msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)" msgstr "" -#: include/views/configuration.item.edit.php:772 -#: include/views/configuration.item.edit.php:777 -#: include/views/configuration.item.edit.php:798 -#: include/views/configuration.item.edit.php:803 +#: include/views/configuration.item.edit.php:759 +#: include/views/configuration.item.edit.php:764 +#: include/views/configuration.item.edit.php:785 +#: include/views/configuration.item.edit.php:790 msgctxt "item_form" msgid "global housekeeping settings" msgstr "" @@ -18544,7 +18567,7 @@ msgstr "" msgid "host pattern" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1753 +#: include/classes/api/services/CItemGeneral.php:1831 msgid "hostid of dependent item and master item should match" msgstr "" @@ -18587,7 +18610,7 @@ msgstr "" msgid "invalid address range \"%1$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:235 +#: include/classes/validators/CApiInputValidator.php:239 msgid "invalid byte sequence in UTF-8" msgstr "" @@ -18602,15 +18625,15 @@ msgstr "" msgid "invalid history storage period" msgstr "" -#: include/classes/validators/CApiInputValidator.php:855 +#: include/classes/validators/CApiInputValidator.php:859 msgid "invalid host group name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:899 +#: include/classes/validators/CApiInputValidator.php:903 msgid "invalid host name" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1129 +#: include/classes/validators/CApiInputValidator.php:1162 msgid "invalid regular expression" msgstr "" @@ -18632,7 +18655,7 @@ msgstr "" msgid "is less than or equals" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1365 +#: include/classes/validators/CApiInputValidator.php:1398 msgid "is not enclosed in {} or is malformed" msgstr "" @@ -18654,7 +18677,7 @@ msgid "key is empty" msgstr "" #: include/classes/graphdraw/CLineGraphDraw.php:1850 -#: include/classes/graphdraw/CPieGraphDraw.php:330 include/forms.inc.php:2022 +#: include/classes/graphdraw/CPieGraphDraw.php:330 include/forms.inc.php:2270 #: include/graphs.inc.php:82 include/maintenances.inc.php:115 #: include/views/js/configuration.graph.edit.js.php:52 msgid "last" @@ -18668,12 +18691,7 @@ msgstr "" msgid "left" msgstr "" -#: include/views/configuration.item.edit.php:1002 -#: include/views/configuration.item.massupdate.php:379 -#: include/views/configuration.item.prototype.edit.php:835 -#: include/views/configuration.item.prototype.massupdate.php:356 -#: include/views/js/common.item.edit.js.php:197 -#: include/views/js/configuration.item.massupdate.js.php:154 +#: include/forms.inc.php:1463 include/views/js/item.preprocessing.js.php:146 msgid "list of characters" msgstr "" @@ -18727,20 +18745,19 @@ msgid "map" msgstr "" #: include/actions.inc.php:34 -#: include/views/configuration.host.discovery.edit.php:633 -#: include/views/js/configuration.host.discovery.edit.js.php:24 +#: include/views/configuration.host.discovery.edit.php:621 +#: include/views/js/configuration.host.discovery.edit.js.php:26 msgid "matches" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #: include/classes/graphdraw/CLineGraphDraw.php:1853 #: include/classes/graphdraw/CLineGraphDraw.php:1867 -#: include/classes/graphdraw/CPieGraphDraw.php:326 include/graphs.inc.php:80 -#: include/views/configuration.item.edit.php:1032 -#: include/views/configuration.item.prototype.edit.php:865 -#: include/views/js/common.item.edit.js.php:237 +#: include/classes/graphdraw/CPieGraphDraw.php:326 include/forms.inc.php:1497 +#: include/graphs.inc.php:80 #: include/views/js/configuration.graph.edit.js.php:51 #: include/views/js/configuration.graph.edit.js.php:59 +#: include/views/js/item.preprocessing.js.php:192 msgid "max" msgstr "" @@ -18748,28 +18765,24 @@ msgstr "" msgid "max() - Maximum value for period T" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1851 +#: include/classes/api/services/CItemGeneral.php:1942 msgid "maximum dependent items count reached" msgstr "" -#: include/classes/api/services/CHostGeneral.php:1031 -#: include/classes/api/services/CItemGeneral.php:1766 -#: include/classes/api/services/CItemGeneral.php:1860 -#: include/classes/api/services/CItemGeneral.php:1980 -#: include/classes/import/CConfigurationImport.php:2565 -#: include/classes/import/CConfigurationImport.php:2626 +#: include/classes/api/services/CItemGeneral.php:1928 +#: include/classes/import/CConfigurationImport.php:2573 +#: include/classes/import/CConfigurationImport.php:2634 msgid "maximum number of dependency levels reached" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1324 +#: include/classes/api/services/CItemGeneral.php:1414 #: include/classes/graphdraw/CLineGraphDraw.php:1851 #: include/classes/graphdraw/CLineGraphDraw.php:1864 -#: include/classes/graphdraw/CPieGraphDraw.php:322 include/graphs.inc.php:78 -#: include/views/configuration.item.edit.php:1031 -#: include/views/configuration.item.prototype.edit.php:864 -#: include/views/js/common.item.edit.js.php:234 +#: include/classes/graphdraw/CPieGraphDraw.php:322 include/forms.inc.php:1496 +#: include/graphs.inc.php:78 #: include/views/js/configuration.graph.edit.js.php:49 #: include/views/js/configuration.graph.edit.js.php:57 +#: include/views/js/item.preprocessing.js.php:189 msgid "min" msgstr "" @@ -18777,7 +18790,7 @@ msgstr "" msgid "min() - Minimum value for period T" msgstr "" -#: include/classes/api/services/CHost.php:1554 +#: include/classes/api/services/CHost.php:1590 #, c-format msgid "minimum length is %1$s characters" msgstr "" @@ -18792,7 +18805,7 @@ msgctxt "millisecond short" msgid "ms" msgstr "" -#: app/views/administration.authentication.edit.php:114 +#: app/views/administration.authentication.edit.php:122 msgid "must be a valid LDAP user" msgstr "" @@ -18810,17 +18823,17 @@ msgstr "" msgid "must be between \"%1$s\" and \"%2$s\"" msgstr "" -#: include/classes/validators/CApiInputValidator.php:862 -#: include/classes/validators/CApiInputValidator.php:906 +#: include/classes/validators/CApiInputValidator.php:866 +#: include/classes/validators/CApiInputValidator.php:910 msgid "must contain at least one low-level discovery macro" msgstr "" -#: include/views/configuration.host.discovery.edit.php:125 -#: include/views/configuration.host.discovery.edit.php:220 -#: include/views/configuration.item.edit.php:157 -#: include/views/configuration.item.edit.php:252 -#: include/views/configuration.item.prototype.edit.php:145 -#: include/views/configuration.item.prototype.edit.php:240 +#: include/views/configuration.host.discovery.edit.php:124 +#: include/views/configuration.host.discovery.edit.php:216 +#: include/views/configuration.item.edit.php:159 +#: include/views/configuration.item.edit.php:251 +#: include/views/configuration.item.prototype.edit.php:144 +#: include/views/configuration.item.prototype.edit.php:236 #: include/views/js/configuration.httpconf.edit.js.php:13 msgid "name" msgstr "" @@ -18829,9 +18842,9 @@ msgstr "" msgid "new" msgstr "" -#: disc_prototypes.php:1251 disc_prototypes.php:1275 hosts.php:1180 +#: disc_prototypes.php:1274 disc_prototypes.php:1298 hosts.php:1180 #: include/views/configuration.host.massupdate.php:83 -#: include/views/configuration.item.massupdate.php:591 templates.php:550 +#: include/views/configuration.item.massupdate.php:473 templates.php:550 msgctxt "new element in multiselect" msgid "new" msgstr "" @@ -18854,8 +18867,8 @@ msgstr "" msgid "none" msgstr "" -#: include/classes/api/services/CItemGeneral.php:2168 -#: include/classes/api/services/CItemGeneral.php:2192 +#: include/classes/api/services/CItemGeneral.php:2131 +#: include/classes/api/services/CItemGeneral.php:2155 msgid "nonempty key and value pair expected" msgstr "" @@ -18866,7 +18879,7 @@ msgstr "" #: app/controllers/CControllerDashboardView.php:134 #: hostinventoriesoverview.php:76 #: include/classes/pagefilter/CPageFilter.php:808 -#: include/classes/pagefilter/CPageFilter.php:875 include/forms.inc.php:1134 +#: include/classes/pagefilter/CPageFilter.php:875 include/forms.inc.php:1131 #: include/views/monitoring.screen.php:63 slides.php:187 msgid "not selected" msgstr "" @@ -18875,13 +18888,7 @@ msgstr "" msgid "now() - Number of seconds since the Epoch" msgstr "" -#: include/views/configuration.item.edit.php:995 -#: include/views/configuration.item.massupdate.php:355 -#: include/views/configuration.item.prototype.edit.php:828 -#: include/views/configuration.item.prototype.massupdate.php:332 -#: include/views/js/common.item.edit.js.php:188 -#: include/views/js/configuration.item.massupdate.js.php:45 -#: include/views/js/configuration.item.massupdate.js.php:145 +#: include/forms.inc.php:1456 include/views/js/item.preprocessing.js.php:137 msgid "number" msgstr "" @@ -18941,35 +18948,15 @@ msgstr "" msgid "other" msgstr "" -#: include/views/configuration.item.edit.php:1017 -#: include/views/configuration.item.massupdate.php:368 -#: include/views/configuration.item.prototype.edit.php:850 -#: include/views/configuration.item.prototype.massupdate.php:345 -#: include/views/js/common.item.edit.js.php:58 -#: include/views/js/common.item.edit.js.php:218 -#: include/views/js/configuration.item.massupdate.js.php:46 +#: include/forms.inc.php:1482 include/views/js/item.preprocessing.js.php:26 +#: include/views/js/item.preprocessing.js.php:173 msgid "output" msgstr "" -#: include/views/configuration.item.edit.php:1010 -#: include/views/configuration.item.massupdate.php:385 -#: include/views/configuration.item.prototype.edit.php:843 -#: include/views/configuration.item.prototype.massupdate.php:362 -#: include/views/js/common.item.edit.js.php:207 -#: include/views/js/configuration.item.massupdate.js.php:162 -msgid "path" -msgstr "" - -#: include/views/configuration.item.edit.php:1016 -#: include/views/configuration.item.edit.php:1037 -#: include/views/configuration.item.massupdate.php:390 -#: include/views/configuration.item.prototype.edit.php:849 -#: include/views/configuration.item.prototype.edit.php:870 -#: include/views/configuration.item.prototype.massupdate.php:367 -#: include/views/js/common.item.edit.js.php:55 -#: include/views/js/common.item.edit.js.php:215 -#: include/views/js/common.item.edit.js.php:244 -#: include/views/js/configuration.item.massupdate.js.php:169 +#: include/forms.inc.php:1481 include/forms.inc.php:1502 +#: include/views/js/item.preprocessing.js.php:23 +#: include/views/js/item.preprocessing.js.php:170 +#: include/views/js/item.preprocessing.js.php:199 msgid "pattern" msgstr "" @@ -18994,8 +18981,8 @@ msgstr "" msgid "regexp() - Regular expression V matching last value in period T (1 - match, 0 - no match)" msgstr "" -#: include/views/configuration.host.discovery.edit.php:656 -#: include/views/js/configuration.host.discovery.edit.js.php:29 +#: include/views/configuration.host.discovery.edit.php:644 +#: include/views/js/configuration.host.discovery.edit.js.php:31 msgid "regular expression" msgstr "" @@ -19018,7 +19005,7 @@ msgstr "" msgid "root" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1760 +#: include/classes/api/services/CItemGeneral.php:1838 msgid "ruleid of dependent item and master item should match" msgstr "" @@ -19027,18 +19014,16 @@ msgctxt "second short" msgid "s" msgstr "" -#: include/forms.inc.php:2019 include/maintenances.inc.php:112 +#: include/forms.inc.php:2267 include/maintenances.inc.php:112 msgctxt "adjective" msgid "second" msgstr "" -#: include/classes/api/services/CItemGeneral.php:1282 +#: include/classes/api/services/CItemGeneral.php:1372 msgid "second parameter is expected" msgstr "" -#: include/views/configuration.item.edit.php:1042 -#: include/views/configuration.item.prototype.edit.php:875 -#: include/views/js/common.item.edit.js.php:251 +#: include/forms.inc.php:1507 include/views/js/item.preprocessing.js.php:206 msgid "seconds" msgstr "" @@ -19050,19 +19035,19 @@ msgstr "" msgid "short description" msgstr "" -#: include/classes/api/services/CHost.php:1561 -#: include/classes/api/services/CHost.php:1567 -#: include/classes/api/services/CHost.php:1576 -#: include/classes/api/services/CHost.php:1582 +#: include/classes/api/services/CHost.php:1597 +#: include/classes/api/services/CHost.php:1603 +#: include/classes/api/services/CHost.php:1612 +#: include/classes/api/services/CHost.php:1618 #: include/classes/api/services/CHttpTest.php:967 #: include/classes/api/services/CHttpTest.php:1076 #: include/classes/api/services/CItemGeneral.php:499 #: include/classes/api/services/CItemGeneral.php:537 -#: include/classes/api/services/CItemGeneral.php:1340 -#: include/classes/api/services/CItemGeneral.php:1363 -#: include/classes/api/services/CItemGeneral.php:1427 -#: include/classes/api/services/CItemGeneral.php:1455 -#: include/classes/api/services/CItemGeneral.php:2145 +#: include/classes/api/services/CItemGeneral.php:1430 +#: include/classes/api/services/CItemGeneral.php:1453 +#: include/classes/api/services/CItemGeneral.php:1517 +#: include/classes/api/services/CItemGeneral.php:1545 +#: include/classes/api/services/CItemGeneral.php:2108 #: include/classes/api/services/CMaintenance.php:468 #: include/classes/api/services/CMaintenance.php:637 #: include/classes/api/services/CProxy.php:661 @@ -19078,10 +19063,10 @@ msgstr "" msgid "show icon mappings" msgstr "" -#: include/views/configuration.item.edit.php:836 -#: include/views/configuration.item.massupdate.php:555 -#: include/views/configuration.item.prototype.edit.php:712 -#: include/views/configuration.item.prototype.massupdate.php:544 +#: include/views/configuration.item.edit.php:821 +#: include/views/configuration.item.massupdate.php:445 +#: include/views/configuration.item.prototype.edit.php:702 +#: include/views/configuration.item.prototype.massupdate.php:444 msgid "show value mappings" msgstr "" @@ -19139,8 +19124,10 @@ msgstr "" #: app/controllers/CControllerDashboardUpdate.php:135 #: app/controllers/CControllerDashboardUpdate.php:143 #: include/classes/api/services/CDashboard.php:385 +#: include/classes/api/services/CDiscoveryRule.php:1441 +#: include/classes/api/services/CDiscoveryRule.php:1449 #: include/classes/api/services/CHttpTest.php:750 -#: include/classes/validators/CApiInputValidator.php:683 +#: include/classes/validators/CApiInputValidator.php:687 #, c-format msgid "the parameter \"%1$s\" is missing" msgstr "" @@ -19151,7 +19138,7 @@ msgstr "" msgid "the tag \"%1$s\" is missing" msgstr "" -#: include/forms.inc.php:2020 include/maintenances.inc.php:113 +#: include/forms.inc.php:2268 include/maintenances.inc.php:113 msgid "third" msgstr "" @@ -19190,7 +19177,7 @@ msgstr "" msgid "type here to search" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1397 +#: include/classes/validators/CApiInputValidator.php:1430 msgid "unacceptible URL" msgstr "" @@ -19204,7 +19191,7 @@ msgstr "" #: include/classes/api/services/CHttpTest.php:464 #: include/classes/api/services/CHttpTest.php:488 -#: include/classes/validators/CApiInputValidator.php:655 +#: include/classes/validators/CApiInputValidator.php:659 #, c-format msgid "unexpected parameter \"%1$s\"" msgstr "" @@ -19224,11 +19211,11 @@ msgstr "" #: include/classes/api/services/CEvent.php:805 #: include/classes/api/services/CEvent.php:905 -#: include/classes/api/services/CHost.php:1516 -#: include/classes/api/services/CHost.php:1522 -#: include/classes/api/services/CItemGeneral.php:1208 -#: include/classes/api/services/CItemGeneral.php:1414 -#: include/classes/api/services/CItemGeneral.php:1440 +#: include/classes/api/services/CHost.php:1552 +#: include/classes/api/services/CHost.php:1558 +#: include/classes/api/services/CItemGeneral.php:1298 +#: include/classes/api/services/CItemGeneral.php:1504 +#: include/classes/api/services/CItemGeneral.php:1530 #: include/classes/api/services/CProxy.php:559 #: include/classes/api/services/CProxy.php:566 #: include/classes/api/services/CTriggerGeneral.php:574 @@ -19261,12 +19248,12 @@ msgstr "" #: include/views/administration.usergroups.edit.php:246 #: include/views/configuration.action.edit.php:370 #: include/views/configuration.correlation.edit.php:152 -#: include/views/configuration.host.discovery.edit.php:129 -#: include/views/configuration.host.discovery.edit.php:224 -#: include/views/configuration.item.edit.php:161 -#: include/views/configuration.item.edit.php:256 -#: include/views/configuration.item.prototype.edit.php:149 -#: include/views/configuration.item.prototype.edit.php:244 +#: include/views/configuration.host.discovery.edit.php:128 +#: include/views/configuration.host.discovery.edit.php:220 +#: include/views/configuration.item.edit.php:163 +#: include/views/configuration.item.edit.php:255 +#: include/views/configuration.item.prototype.edit.php:148 +#: include/views/configuration.item.prototype.edit.php:240 #: include/views/configuration.maintenance.edit.php:210 #: include/views/configuration.trigger.prototype.edit.php:500 #: include/views/configuration.trigger.prototype.massupdate.php:146 @@ -19275,55 +19262,61 @@ msgstr "" #: include/views/configuration.triggers.massupdate.php:129 #: include/views/hostmacros.php:85 #: include/views/js/administration.general.macros.edit.js.php:11 -#: include/views/js/common.item.edit.js.php:305 #: include/views/js/configuration.httpconf.edit.js.php:18 #: include/views/js/configuration.maintenance.edit.js.php:11 #: include/views/js/configuration.maintenance.edit.js.php:35 #: include/views/js/configuration.triggers.edit.js.php:9 #: include/views/js/configuration.triggers.list.js.php:11 #: include/views/js/hostmacros.js.php:11 +#: include/views/js/item.preprocessing.js.php:260 msgid "value" msgstr "" +#: include/classes/api/services/CDiscoveryRule.php:1320 +#, c-format +msgid "value \"%1$s\" already exists" +msgstr "" + #: include/classes/import/CConfigurationImport.php:808 #: include/classes/import/CConfigurationImport.php:846 -#: include/classes/import/CConfigurationImport.php:2461 -#: include/classes/import/CConfigurationImport.php:2575 -#: include/classes/import/CConfigurationImport.php:2620 +#: include/classes/import/CConfigurationImport.php:2469 +#: include/classes/import/CConfigurationImport.php:2583 +#: include/classes/import/CConfigurationImport.php:2628 #, c-format msgid "value \"%1$s\" not found" msgstr "" -#: include/classes/validators/CApiInputValidator.php:1219 -#: include/classes/validators/CApiInputValidator.php:1273 +#: include/classes/validators/CApiInputValidator.php:1252 +#: include/classes/validators/CApiInputValidator.php:1306 #, c-format msgid "value %1$s already exists" msgstr "" -#: include/classes/validators/CApiInputValidator.php:338 -#: include/classes/validators/CApiInputValidator.php:846 -#: include/classes/validators/CApiInputValidator.php:889 -#: include/classes/validators/CApiInputValidator.php:941 -#: include/classes/validators/CApiInputValidator.php:986 -#: include/classes/validators/CApiInputValidator.php:1021 -#: include/classes/validators/CApiInputValidator.php:1052 -#: include/classes/validators/CApiInputValidator.php:1086 -#: include/classes/validators/CApiInputValidator.php:1120 -#: include/classes/validators/CApiInputValidator.php:1360 -#: include/classes/validators/CApiInputValidator.php:1392 +#: include/classes/validators/CApiInputValidator.php:342 +#: include/classes/validators/CApiInputValidator.php:850 +#: include/classes/validators/CApiInputValidator.php:893 +#: include/classes/validators/CApiInputValidator.php:945 +#: include/classes/validators/CApiInputValidator.php:990 +#: include/classes/validators/CApiInputValidator.php:1025 +#: include/classes/validators/CApiInputValidator.php:1054 +#: include/classes/validators/CApiInputValidator.php:1085 +#: include/classes/validators/CApiInputValidator.php:1119 +#: include/classes/validators/CApiInputValidator.php:1153 +#: include/classes/validators/CApiInputValidator.php:1393 +#: include/classes/validators/CApiInputValidator.php:1425 msgid "value is too long" msgstr "" #: include/classes/api/services/CHost.php:771 -#: include/classes/api/services/CHost.php:1678 -#: include/classes/api/services/CHost.php:1818 +#: include/classes/api/services/CHost.php:1714 +#: include/classes/api/services/CHost.php:1854 #: include/classes/api/services/CMapElement.php:75 #: include/classes/api/services/CMap.php:675 #: include/classes/api/services/CMap.php:681 #: include/classes/api/services/CMap.php:1129 #: include/classes/api/services/CMap.php:1135 -#: include/classes/validators/CApiInputValidator.php:332 -#: include/classes/validators/CApiInputValidator.php:476 +#: include/classes/validators/CApiInputValidator.php:336 +#: include/classes/validators/CApiInputValidator.php:480 #, c-format msgid "value must be one of %1$s" msgstr "" |